From ad2762cf775a8dde508de47164d6429f3fd724f1 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Sun, 24 May 2015 16:57:33 +0800 Subject: Move to a more recent django project structure This change updates patchwor to the newer project struture: we've moved the actual application out of the apps/ directory, and the patchwork-specific templates to under the patchwork application. This gives us the manage.py script in the top-level now. Signed-off-by: Jeremy Kerr --- lib/apache2/patchwork.mod_python.conf | 2 +- lib/apache2/patchwork.wsgi | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/apache2/patchwork.mod_python.conf b/lib/apache2/patchwork.mod_python.conf index 6395738..c46f86c 100644 --- a/lib/apache2/patchwork.mod_python.conf +++ b/lib/apache2/patchwork.mod_python.conf @@ -7,7 +7,7 @@ NameVirtualHost patchwork.example.com:80 SetHandler python-program PythonHandler django.core.handlers.modpython - PythonPath "['/srv/patchwork/apps', '/srv/patchwork/lib/python'] + sys.path" + PythonPath "['/srv/patchwork', '/srv/patchwork/lib/python'] + sys.path" SetEnv DJANGO_SETTINGS_MODULE settings diff --git a/lib/apache2/patchwork.wsgi b/lib/apache2/patchwork.wsgi index 869bb9d..52feb58 100644 --- a/lib/apache2/patchwork.wsgi +++ b/lib/apache2/patchwork.wsgi @@ -12,8 +12,7 @@ import sys basedir = os.path.join( os.path.dirname(__file__), os.path.pardir, os.path.pardir) sys.path.append(basedir) -sys.path.append(os.path.join(basedir, 'apps')) -os.environ['DJANGO_SETTINGS_MODULE'] = 'apps.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'patchwork.settings.prod' import django.core.handlers.wsgi application = django.core.handlers.wsgi.WSGIHandler() -- cgit v1.2.3