put wsgi.py in myslice/ and propagate this change

diff --git a/apache/__init__.py b/apache/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/apache/myslice.conf b/apache/myslice.conf
index a7f6f2c..4331bcc 100644 (file)
--- a/apache/myslice.conf
+++ b/apache/myslice.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
 <VirtualHost *:80>

-        WSGIScriptAlias / /usr/share/unfold/apache/wsgi.py
+        WSGIScriptAlias / /usr/share/unfold/myslice/wsgi.py

         <Directory /usr/share/unfold/apache>
         <Files wsgi.py>
         Order deny,allow
         <Directory /usr/share/unfold/apache>
         <Files wsgi.py>
         Order deny,allow

diff --git a/debian/unfold.install b/debian/unfold.install
index 8dc6fd8..a86e983 100644 (file)
--- a/debian/unfold.install
+++ b/debian/unfold.install
@@ -12,4 +12,3 @@ usr/share/unfold/trash
 usr/share/unfold/debug_platform
 manage.py usr/share/unfold/
 apache/myslice.conf /etc/apache2/sites-available
 usr/share/unfold/debug_platform
 manage.py usr/share/unfold/
 apache/myslice.conf /etc/apache2/sites-available

-apache/wsgi.py usr/share/unfold/apache

diff --git a/myslice/settings.py b/myslice/settings.py
index 7b9e3c2..4878c0d 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -148,7 +148,7 @@ MIDDLEWARE_CLASSES = (
 ROOT_URLCONF = 'myslice.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 ROOT_URLCONF = 'myslice.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.

-WSGI_APPLICATION = 'apache.wsgi.application'
+WSGI_APPLICATION = 'myslice.wsgi.application'

 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".

diff --git a/apache/wsgi.py b/myslice/wsgi.py
similarity index 100%
rename from apache/wsgi.py
rename to myslice/wsgi.py

diff --git a/setup.py b/setup.py
index 87b7788..157641a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -20,5 +20,5 @@ setup(packages = packages,
         ( 'static/img', glob ('static/img/*')),
         ( 'static/fonts', glob ('static/fonts/*')),
         ( 'templates', glob ('templates/*')),
         ( 'static/img', glob ('static/img/*')),
         ( 'static/fonts', glob ('static/fonts/*')),
         ( 'templates', glob ('templates/*')),

-        ( 'apache', [ 'apache/myslice.conf', 'apache/wsgi.py' ]),
+        ( 'apache', [ 'apache/myslice.conf' ]),

         ])
         ])