diff options
| author | Guilherme Salgado <guilherme.salgado@linaro.org> | 2011-02-15 02:30:54 +0000 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2011-02-28 09:54:15 +0800 |
| commit | 1dbb7b85cb00bbdfecfce8831096d9a15111ac37 (patch) | |
| tree | baec54103373a34244926b9cffbadf7601204039 /lib | |
| parent | fec4267113abb18890ddf04b744122892af63383 (diff) | |
| download | patchwork-1dbb7b85cb00bbdfecfce8831096d9a15111ac37.tar patchwork-1dbb7b85cb00bbdfecfce8831096d9a15111ac37.tar.gz | |
helpers: Change patchwork.wsgi to include the apps/ dir in sys.path
Without this, templates will crash as they reference patchwork.<module>
directly.
Also removes the patchwork.wsgi symlink from the root and use the real
file in patchwork.wsgi.conf instead, as suggested by Dirk Wallenstein.
Signed-off-by: Guilherme Salgado <guilherme.salgado@linaro.org>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/apache2/patchwork.wsgi | 4 | ||||
| -rw-r--r-- | lib/apache2/patchwork.wsgi.conf | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/apache2/patchwork.wsgi b/lib/apache2/patchwork.wsgi index 0488b48..869bb9d 100644 --- a/lib/apache2/patchwork.wsgi +++ b/lib/apache2/patchwork.wsgi @@ -9,8 +9,10 @@ import os import sys -basedir = os.path.dirname(__file__) +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' import django.core.handlers.wsgi diff --git a/lib/apache2/patchwork.wsgi.conf b/lib/apache2/patchwork.wsgi.conf index e99f8c6..3756e5a 100644 --- a/lib/apache2/patchwork.wsgi.conf +++ b/lib/apache2/patchwork.wsgi.conf @@ -16,5 +16,5 @@ </Directory> </IfModule> -WSGIScriptAlias / "/srv/patchwork/patchwork.wsgi" +WSGIScriptAlias / "/srv/patchwork/lib/apache2/patchwork.wsgi" WSGIPassAuthorization On |