aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <stephen.finucane@intel.com>2016-02-05 17:31:57 +0000
committerStephen Finucane <stephen.finucane@intel.com>2016-02-08 18:56:12 +0000
commit8fe68d96f18eab84479697cbb0439ba616fcc162 (patch)
tree0fc4a13dfe4ccbb39c0b18312b6a2c85c4765e86
parent16ff40d48afaa041046617a2faf7b3150c3126eb (diff)
downloadpatchwork-8fe68d96f18eab84479697cbb0439ba616fcc162.tar
patchwork-8fe68d96f18eab84479697cbb0439ba616fcc162.tar.gz
wsgi: Move wsgi file to expected location
Django places a wsgi.py file in the root of each application's directory. Do this, adding a symlink to preserve existing operation for users. Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>
-rw-r--r--lib/apache2/patchwork.wsgi19
-rw-r--r--patchwork/wsgi.py31
2 files changed, 31 insertions, 19 deletions
diff --git a/lib/apache2/patchwork.wsgi b/lib/apache2/patchwork.wsgi
deleted file mode 100644
index efa870b..0000000
--- a/lib/apache2/patchwork.wsgi
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Apache2 WSGI handler for patchwork
-#
-# Copyright © 2010 martin f. krafft <madduck@madduck.net>
-# Released under the GNU General Public License v2 or later.
-#
-import os
-import sys
-
-basedir = os.path.join(
- os.path.dirname(__file__), os.path.pardir, os.path.pardir)
-sys.path.append(basedir)
-
-os.environ['DJANGO_SETTINGS_MODULE'] = 'patchwork.settings.production'
-
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
diff --git a/patchwork/wsgi.py b/patchwork/wsgi.py
new file mode 100644
index 0000000..c304830
--- /dev/null
+++ b/patchwork/wsgi.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Patchwork - automated patch tracking system
+# Copyright (C) 2010 Martin F. Krafft <madduck@madduck.net>
+#
+# This file is part of the Patchwork package.
+#
+# Patchwork is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Patchwork is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchwork; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Released under the GNU General Public License v2 or later.
+
+import os
+import sys
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'patchwork.settings.production'
+
+application = get_wsgi_application()