fix gallery merge: unnecessary assertions

[redakcja.git] / redakcja.vhost.template

diff --git a/redakcja.vhost.template b/redakcja.vhost.template
index fbd21a9..0c56cbd 100644 (file)
--- a/redakcja.vhost.template
+++ b/redakcja.vhost.template
@@ -1,20 +1,18 @@
 <VirtualHost *:80>
     ServerName $DOMAIN
 <VirtualHost *:80>
     ServerName $DOMAIN

-    ServerAlias $DOMAIN_ALIASES

     ServerAdmin $ADMIN_EMAIL
 
     WSGIDaemonProcess $PROJECT_NAME user=$WSGI_USER group=$WSGI_USER processes=$WSGI_PROCESSES threads=$WSGI_THREADS display-name=%{GROUP}
     WSGIProcessGroup $PROJECT_NAME
 
     ServerAdmin $ADMIN_EMAIL
 
     WSGIDaemonProcess $PROJECT_NAME user=$WSGI_USER group=$WSGI_USER processes=$WSGI_PROCESSES threads=$WSGI_THREADS display-name=%{GROUP}
     WSGIProcessGroup $PROJECT_NAME
 

-    WSGIScriptAlias / $WSGI_TARGET
+    WSGIScriptAlias / $WSGI_FILE

     <Directory $WSGI_DIR>
         Order allow,deny
         allow from all
     </Directory>
 
     <Directory $WSGI_DIR>
         Order allow,deny
         allow from all
     </Directory>
 

-    Alias /media $MEDIA_ROOT
-    <Directory $MEDIA_ROOT >
-        Options Indexes, FollowLinks
+    Alias /media $MEDIA_DIR
+    <Directory $MEDIA_DIR>

         Order allow,deny
         Allow from all
     </Directory>
         Order allow,deny
         Allow from all
     </Directory>