Add WSGI script, move manage.py to project root.
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Mon, 22 Jul 2013 12:52:40 +0000 (14:52 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Mon, 22 Jul 2013 12:52:40 +0000 (14:52 +0200)
manage.py [new file with mode: 0755]
redakcja/manage.py [deleted file]
redakcja/wsgi.py [new file with mode: 0755]

diff --git a/manage.py b/manage.py
new file mode 100755 (executable)
index 0000000..dea56f5
--- /dev/null
+++ b/manage.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+import os
+import sys
+
+ROOT = os.path.dirname(os.path.abspath(__file__))
+sys.path = [
+    os.path.join(ROOT, 'apps'),
+    os.path.join(ROOT, 'lib'),
+    os.path.join(ROOT, 'lib/librarian'),
+] + sys.path
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "redakcja.localsettings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/redakcja/manage.py b/redakcja/manage.py
deleted file mode 100755 (executable)
index 7647675..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-from django.core.management import execute_manager
-
-import logging
-import sys
-import os
-
-logging.basicConfig(level=logging.DEBUG, stream=sys.stderr)
-
-PROJECT_ROOT = os.path.realpath(os.path.dirname(__file__))
-sys.path += [os.path.realpath(os.path.join(*x)) for x in (
-        (PROJECT_ROOT, '..'),
-        (PROJECT_ROOT, '..', 'apps'),
-        (PROJECT_ROOT, '..', 'lib/librarian'),
-        (PROJECT_ROOT, '..', 'lib')
-)]
-
-try:
-    import localsettings  # Assumed to be in the same directory.
-except ImportError:
-    logging.exception("Failed to import settings")
-    import sys
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(localsettings)
diff --git a/redakcja/wsgi.py b/redakcja/wsgi.py
new file mode 100755 (executable)
index 0000000..cd69a92
--- /dev/null
@@ -0,0 +1,21 @@
+import os
+import os.path
+import sys
+
+ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+# Add apps and lib directories to PYTHONPATH
+sys.path = [
+    ROOT,
+    os.path.join(ROOT, 'apps'),
+    os.path.join(ROOT, 'lib'),
+    os.path.join(ROOT, 'lib/librarian'),
+] + sys.path
+
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "redakcja.localsettings")
+
+# This application object is used by the development server
+# as well as any WSGI server configured to use this file.
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()