From ed3a95a8b29e91d3aa170688042e3b0ac4ee9f99 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sat, 21 Sep 2013 01:15:49 +0200 Subject: [PATCH] debian: add debian_wsgi.py script, rename settings to debian_settings,py --- debian/{settings.py => debian_settings.py} | 0 debian/debian_wsgi.py | 32 ++++++++++++++++++++++ debian/manage.py | 2 +- debian/wcsinstd.init | 4 +-- debian/wcsinstd.install | 3 +- 5 files changed, 37 insertions(+), 4 deletions(-) rename debian/{settings.py => debian_settings.py} (100%) create mode 100644 debian/debian_wsgi.py diff --git a/debian/settings.py b/debian/debian_settings.py similarity index 100% rename from debian/settings.py rename to debian/debian_settings.py diff --git a/debian/debian_wsgi.py b/debian/debian_wsgi.py new file mode 100644 index 0000000..94e81c3 --- /dev/null +++ b/debian/debian_wsgi.py @@ -0,0 +1,32 @@ +""" +WSGI config for wcsinst project. + +This module contains the WSGI application used by Django's development server +and any production WSGI deployments. It should expose a module-level variable +named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover +this application via the ``WSGI_APPLICATION`` setting. + +Usually you will have the standard Django WSGI application here, but it also +might make sense to replace the whole Django WSGI application with a custom one +that later delegates to the Django one. For example, you could introduce WSGI +middleware here, or combine a Django application with an application of another +framework. + +""" +import os + +# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks +# if running multiple sites in the same mod_wsgi process. To fix this, use +# mod_wsgi daemon mode with each site in its own daemon process, or use +# os.environ["DJANGO_SETTINGS_MODULE"] = "wcsinst.settings" +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "debian_settings") + +# This application object is used by any WSGI server configured to use this +# file. This includes Django's development server, if the WSGI_APPLICATION +# setting points here. +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() + +# Apply WSGI middleware here. +# from helloworld.wsgi import HelloWorldApplication +# application = HelloWorldApplication(application) diff --git a/debian/manage.py b/debian/manage.py index 14e50bb..b6f8c0c 100755 --- a/debian/manage.py +++ b/debian/manage.py @@ -4,7 +4,7 @@ import sys if __name__ == "__main__": sys.path.insert(0, '/usr/lib/wcsinstd') - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "debian_settings") from django.core.management import execute_from_command_line diff --git a/debian/wcsinstd.init b/debian/wcsinstd.init index 49edecb..8034f7d 100644 --- a/debian/wcsinstd.init +++ b/debian/wcsinstd.init @@ -31,9 +31,9 @@ DAEMON_ARGS="--pid $PIDFILE \ --workers=1 \ --worker-class=sync \ --timeout=60 \ -wcsinst.wsgi:application" +debian_wsgi:application" -PYTHONPATH=/usr/lib/$NAME +export PYTHONPATH=/usr/lib/$NAME # Exit if the package is not installed [ -x $DAEMON ] || exit 0 diff --git a/debian/wcsinstd.install b/debian/wcsinstd.install index 68ce8fc..49f8f14 100644 --- a/debian/wcsinstd.install +++ b/debian/wcsinstd.install @@ -1,2 +1,3 @@ debian/manage.py usr/lib/wcsinstd -debian/settings.py usr/lib/wcsinstd +debian/debian_settings.py usr/lib/wcsinstd +debian/debian_wsgi.py usr/lib/wcsinstd