summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérôme Schneider <jschneider@entrouvert.com>2014-06-04 09:03:25 (GMT)
committerJérôme Schneider <jschneider@entrouvert.com>2014-06-04 09:03:25 (GMT)
commit2840250f87f3a692ea87c9a8fcd3587bc9777eb4 (patch)
treef9712bc7b87a15aa74bee0a58862311d9635400e
parent0775eaf5f729a239dc59c844e28b77771c22eee4 (diff)
downloadmandaye-meyzieu-2840250f87f3a692ea87c9a8fcd3587bc9777eb4.zip
mandaye-meyzieu-2840250f87f3a692ea87c9a8fcd3587bc9777eb4.tar.gz
mandaye-meyzieu-2840250f87f3a692ea87c9a8fcd3587bc9777eb4.tar.bz2
rp_meyzieu: fix wsgi
-rw-r--r--rp_meyzieu/wsgi.py8
-rwxr-xr-xrp_meyzieu_server3
2 files changed, 4 insertions, 7 deletions
diff --git a/rp_meyzieu/wsgi.py b/rp_meyzieu/wsgi.py
index 9155026..034c2a3 100644
--- a/rp_meyzieu/wsgi.py
+++ b/rp_meyzieu/wsgi.py
@@ -1,15 +1,13 @@
import os
-from mandaye.server import MandayeApp
+os.environ.setdefault("MANDAYE_CONFIG_MODULE", "rp_meyzieu.config")
-from rp_meyzieu import config
from beaker.middleware import SessionMiddleware
from whitenoise import WhiteNoise
-os.environ['MANDAYE_CONFIG_MODULE'] = 'test.config'
-
-from mandaye import config
+from rp_meyzieu import config
+from mandaye.server import MandayeApp
application = SessionMiddleware(MandayeApp(), config.session_opts)
application_dev = WhiteNoise(application, root=config.static_root, prefix=config.static_url)
diff --git a/rp_meyzieu_server b/rp_meyzieu_server
index a361759..0a26a84 100755
--- a/rp_meyzieu_server
+++ b/rp_meyzieu_server
@@ -5,9 +5,8 @@
"""
import os
-os.environ['MANDAYE_CONFIG_MODULE'] = 'rp_meyzieu.config'
-import sys
+os.environ.setdefault("MANDAYE_CONFIG_MODULE", "rp_meyzieu.config")
from mandaye.log import logger
from gunicorn.app.wsgiapp import WSGIApplication