From patchwork Tue Feb 15 12:30:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Change patchwork.wsgi to include the apps/ dir in sys.path Date: Tue, 15 Feb 2011 02:30:54 -0000 From: Guilherme Salgado X-Patchwork-Id: 83240 Message-Id: <1297773054-28065-1-git-send-email-guilherme.salgado@linaro.org> To: patchwork@lists.ozlabs.org Without that templates will crash as they reference patwhork. 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 --- lib/apache2/patchwork.wsgi | 4 +++- lib/apache2/patchwork.wsgi.conf | 2 +- patchwork.wsgi | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 120000 patchwork.wsgi \ No newline at end of file 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 @@ -WSGIScriptAlias / "/srv/patchwork/patchwork.wsgi" +WSGIScriptAlias / "/srv/patchwork/lib/apache2/patchwork.wsgi" WSGIPassAuthorization On diff --git a/patchwork.wsgi b/patchwork.wsgi deleted file mode 120000 index cf13d18..0000000 --- a/patchwork.wsgi +++ /dev/null @@ -1 +0,0 @@ -lib/apache2/patchwork.wsgi