From d2c5f82b12665f980b12331255d6ed4fb8215967 Mon Sep 17 00:00:00 2001 From: Ben Adida <ben@adida.net> Date: Sun, 25 Aug 2013 10:52:57 -0700 Subject: [PATCH] working towards wsgi runnability --- Procfile | 1 + django.wsgi | 2 -- manage.py | 15 +++++++-------- wsgi.py | 5 +++++ 4 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 Procfile create mode 100644 wsgi.py diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..dbff379 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn django.wsgi \ No newline at end of file diff --git a/django.wsgi b/django.wsgi index be63e5b..e18f5f8 100644 --- a/django.wsgi +++ b/django.wsgi @@ -1,8 +1,6 @@ import os import sys -sys.path.append('/web/helios-server') - os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' import django.core.handlers.wsgi diff --git a/manage.py b/manage.py index 5e78ea9..f9726f9 100644 --- a/manage.py +++ b/manage.py @@ -1,11 +1,10 @@ #!/usr/bin/env python -from django.core.management import execute_manager -try: - import settings # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) - sys.exit(1) +import os +import sys if __name__ == "__main__": - execute_manager(settings) + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/wsgi.py b/wsgi.py new file mode 100644 index 0000000..2568204 --- /dev/null +++ b/wsgi.py @@ -0,0 +1,5 @@ +import os +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") + +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() -- GitLab