Merged in deploy (pull request #1)

Deploy
ravrahn · Oct 26, 2015 · 6508a8c · 6508a8c
2 parents 7e61b7d + f8234fb
commit 6508a8c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 40 deletions.
diff --git a/api.py b/api.py
@@ -9,7 +9,6 @@
 import model
 import collections
 from flask_oauthlib.client import OAuth, OAuthException
-from reverse_proxy import *
 
 oauth = OAuth()
 facebook = oauth.remote_app('facebook',
@@ -24,13 +23,6 @@
 
 app = Flask(__name__)
 app.config.from_object('config')
-# if you want to deploy the server, comment this line out:
-app.config['SERVER_NAME'] = 'localhost:5000'
-# and uncomment these two:
-# app.config['SERVER_NAME'] = 'etymograph.com'
-# app.wsgi_app = ReverseProxied(app.wsgi_app)
-# and push it
-
 
 
 @facebook.tokengetter

diff --git a/etymograph.ini b/etymograph.ini
@@ -0,0 +1,11 @@
+[uwsgi]
+module = api
+
+master = true
+processes = 5
+
+socket = /opt/etymograph.sock
+chmod-socket = 666
+vacuum = true
+
+die-on-term = true
diff --git a/reverse_proxy.py b/reverse_proxy.py
diff --git a/wsgi.py b/wsgi.py
@@ -0,0 +1,4 @@
+from api import app as application
+
+if __name__ == "__main__":
+    application.run()