From 6eb310199ae28018c14738dcf6853ffb66bb9b21 Mon Sep 17 00:00:00 2001
From: James <james@zeus.ugent.be>
Date: Thu, 2 Apr 2015 12:45:38 +0200
Subject: [PATCH] Do stuff on server

---
 app/app.py                                 | 11 -----------
 app/james.py                               |  9 ++++-----
 app/passenger_wsgi.py => passenger_wsgi.py |  1 +
 requirements.txt                           | 16 +++++++++-------
 4 files changed, 14 insertions(+), 23 deletions(-)
 rename app/passenger_wsgi.py => passenger_wsgi.py (82%)

diff --git a/app/app.py b/app/app.py
index 415e1f8..0de5014 100644
--- a/app/app.py
+++ b/app/app.py
@@ -12,14 +12,3 @@ app.extensions['bootstrap']['cdns']['bootstrap'] = StaticCDN()
 
 db = SQLAlchemy(app)
 
-class PrefixFix(object):
-
-    def __init__(self, app, script_name):
-        self.app = app
-        self.script_name = script_name
-
-    def __call__(self, environ, start_response):
-        path = environ.get('SCRIPT_NAME', '') + environ.get('PATH_INFO', '')
-        environ['SCRIPT_NAME'] = self.script_name
-        environ['PATH_INFO'] = path[len(self.script_name):]
-        return self.app(environ, start_response)
diff --git a/app/james.py b/app/james.py
index a8692a5..66edc28 100644
--- a/app/james.py
+++ b/app/james.py
@@ -10,8 +10,7 @@ from utils import *
 from views import *
 
 
-if __name__ == '__main__':
-	if app.debug:
-		app.run(host='0.0.0.0', port=80)
-	else:
-		app.run()
+if app.debug:
+	app.run(host='0.0.0.0', port=80)
+else:
+	app.run()
diff --git a/app/passenger_wsgi.py b/passenger_wsgi.py
similarity index 82%
rename from app/passenger_wsgi.py
rename to passenger_wsgi.py
index dce231e..ff8d484 100644
--- a/app/passenger_wsgi.py
+++ b/passenger_wsgi.py
@@ -7,6 +7,7 @@ INTERP = os.path.expanduser("~/env/bin/python")
 if sys.executable != INTERP:
     os.execl(INTERP, INTERP, *sys.argv)
 
+sys.path.append(os.path.join(os.getcwd(), "app"))
 sys.path.append(os.getcwd())
 
 from james import app as application
diff --git a/requirements.txt b/requirements.txt
index b101d8f..3ac6713 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,17 @@
+certifi==14.5.14
 Flask==0.10.1
 Flask-Admin==1.0.9
+Flask-Bootstrap==3.3.2.1
 Flask-Login==0.2.11
+Flask-OAuthlib==0.8.0
 Flask-SQLAlchemy==2.0
 Flask-WTF==0.10.3
-Flask-Bootstrap==3.3.2.1
+itsdangerous==0.24
 Jinja2==2.7.2
 MarkupSafe==0.23
-SQLAlchemy==0.9.8
-WTForms==2.0
-Werkzeug==0.9.6
-itsdangerous==0.24
-requests==2.4.0
-Flask-OAuthlib==0.8.0
 oauthlib==0.7.2
+PyMySQL==0.6.6
+requests==2.4.0
+SQLAlchemy==0.9.8
+Werkzeug==0.9.6
+WTForms==2.0