Merge branch 'master' into production

[wolnelektury.git] / wolnelektury.vhost.template

diff --git a/wolnelektury.vhost.template b/wolnelektury.vhost.template
index 959b164..b077499 100644 (file)
--- a/wolnelektury.vhost.template
+++ b/wolnelektury.vhost.template
@@ -7,28 +7,21 @@
 
     WSGIScriptAlias / %(path)s/%(project_name)s.wsgi
     <Directory %(path)s>
 
     WSGIScriptAlias / %(path)s/%(project_name)s.wsgi
     <Directory %(path)s>

-        Order allow, deny
+        Order allow,deny

         allow from all
     </Directory>
 
     Alias /media %(path)s/media
     <Directory %(path)s/media>
         Options Indexes
         allow from all
     </Directory>
 
     Alias /media %(path)s/media
     <Directory %(path)s/media>
         Options Indexes

-        Order allow, deny
+        Order allow,deny

         Allow from all
     </Directory>
         
         Allow from all
     </Directory>
         

-    Alias /admin-media %(path)s/admin-media
-    <Directory %(path)s/admin-media>
+    Alias /static %(path)s/releases/current/static
+    <Directory %(path)s/releases/current/static>

         Options Indexes
         Options Indexes

-        Order allow, deny
-        Allow from all
-    </Directory>
-
-    Alias /static %(path)s/releases/current/%(project_name)s/static
-    <Directory %(path)s/releases/current/%(project_name)s/static>
-        Options Indexes
-        Order allow, deny
+        Order allow,deny

         Allow from all
     </Directory>
 
         Allow from all
     </Directory>