diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2015-05-24 16:57:33 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2015-05-27 10:26:41 +0800 |
commit | ad2762cf775a8dde508de47164d6429f3fd724f1 (patch) | |
tree | e63015a468cfe32c961908f0338d423227799815 /lib | |
parent | f09e982f58384946111d4157fd2b7c2b31b78612 (diff) | |
download | patchwork-ad2762cf775a8dde508de47164d6429f3fd724f1.tar patchwork-ad2762cf775a8dde508de47164d6429f3fd724f1.tar.gz |
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 <jk@ozlabs.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/apache2/patchwork.mod_python.conf | 2 | ||||
-rw-r--r-- | lib/apache2/patchwork.wsgi | 3 |
2 files changed, 2 insertions, 3 deletions
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 <Location "/"> 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 </Location> 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() |