From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 15 Sep 2015 14:07:02 +0000 (+0200)
Subject: Fix passenger deployment.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=44ff71a6379c551df5ae3612a9f1be8a75c8019f;p=pOCCI-flask.git

Fix passenger deployment.
---

diff --git a/doc/pocci-ssl.conf b/doc/pocci-ssl.conf
index 38d0d20..75293dd 100644
--- a/doc/pocci-ssl.conf
+++ b/doc/pocci-ssl.conf
@@ -27,17 +27,16 @@
     SSLVerifyDepth 10
 
     ServerName localhost
-    DocumentRoot /var/www/html/pOCCI-flask/public
-    <Directory /var/www/html/pOCCI-flask/public>
+
+    Alias /pocci /var/www/pOCCI-flask/public
+    <Location /pocci>
+        PassengerBaseURI /pocci
+        PassengerAppRoot /var/www/pOCCI-flask
+    </Location>
+    <Directory /var/www/pOCCI-flask/public>
         Options -MultiViews
         #Allow from all
         # Uncomment this if you're on Apache >= 2.4:
         Require all granted
     </Directory>
-
-    Alias /pocci /var/www/html/pOCCI-flask/public
-    <Location /pocci>
-        PassengerBaseURI /pocci
-        PassengerAppRoot /var/www/html/pOCCI-flask
-    </Location>
 </VirtualHost>
diff --git a/doc/pocci.conf b/doc/pocci.conf
index ffcbcfc..b5ee157 100644
--- a/doc/pocci.conf
+++ b/doc/pocci.conf
@@ -1,16 +1,15 @@
 <VirtualHost *:80>
     ServerName localhost
-    DocumentRoot /var/www/html/pOCCI-flask/public
-    <Directory /var/www/html/pOCCI-flask/public>
+
+    Alias /pocci /var/www/pOCCI-flask/public
+    <Location /pocci>
+        PassengerBaseURI /pocci
+        PassengerAppRoot /var/www/pOCCI-flask
+    </Location>
+    <Directory /var/www/pOCCI-flask/public>
         Options -MultiViews
         #Allow from all
         # Uncomment this if you're on Apache >= 2.4:
         Require all granted
     </Directory>
-
-    Alias /pocci /var/www/html/pOCCI-flask/public
-    <Location /pocci>
-        PassengerBaseURI /pocci
-        PassengerAppRoot /var/www/html/pOCCI-flask
-    </Location>
 </VirtualHost>