From df645103d905bd1c6f8a8f549c6c16b5efde9550 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Tue, 12 Jun 2018 17:35:59 +0200
Subject: [PATCH] revert PassengerLogFile

---
 hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm |   48 ++++++++++++++++++++++++++++--------------------
 1 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
index 4bf8f0d..a1c89c3 100644
--- a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
@@ -24,27 +24,31 @@
 #end
 
     <Directory />
-		PassengerEnabled Off
+        PassengerEnabled Off
         Options -ExecCGI ${includes} ${indexes} ${multiviews} +SymLinksIfOwnerMatch
     </Directory>
 
     <Directory /home/doms/${dom.name}/>
-		PassengerEnabled On
-        AllowOverride AuthConfig FileInfo Indexes Limit Options=IncludesNoExec,Indexes,MultiViews,PassengerNodejs,PassengerPython,PassengerRuby,PassengerAppEnv
+        PassengerEnabled On
+        AllowOverride AuthConfig FileInfo Indexes Limit Options=ExecCGI,IncludesNoExec,Indexes,MultiViews,SymLinksIfOwnerMatch,PassengerNodejs,PassengerPython,PassengerRuby,PassengerAppEnv
     </Directory>
 
     <Location /cgi-bin/>
-		PassengerEnabled Off
+        PassengerEnabled Off
         SetHandler cgi-script
-        Options +ExecCGI ${includes} -Indexes -MultiViews +SymLinksIfOwnerMatch
+        Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
 
     <Location /fastcgi-bin/>
-		PassengerEnabled Off
+        PassengerEnabled Off
         SetHandler fcgid-script
-        Options +ExecCGI ${includes} -Indexes -MultiViews +SymLinksIfOwnerMatch
+        Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
 
+#if( ${php5} )
+    FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
+
+#end
     RewriteEngine On
     RewriteOptions Inherit
 
@@ -55,8 +59,8 @@
 #end
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
     RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# -d
-    RewriteRule ^(.*) /home/doms/${dom.name}/subs/#[[${tolower:%1}$1 ]]# [last]     
-    
+    RewriteRule ^(.*) /home/doms/${dom.name}/subs/#[[${tolower:%1}$1 ]]# [last] 
+     
 #if( !${htdocsfallback} )
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
@@ -66,8 +70,8 @@
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:80)?$ [novary]
     RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# !-d
     RewriteRule ^(.*) - [redirect=404,last]
- #end
- 
+    
+#end
     AddType application/x-httpd-php .php .php5 .php4 .php3
     Action application/x-httpd-php /fastcgi-bin/phpstub
 </VirtualHost>
@@ -75,7 +79,7 @@
 <VirtualHost ${pac.curINetAddr.inetAddr}:443 ${pac.oldINetAddr.inetAddr}:443>
     ServerName ${dom.name}
     ServerAlias ${dom.serveraliases}
-    ServerAdmin ${dom.user.name}@${dom.name}
+    ServerAdmin webmaster@${dom.name}
 
     SuexecUserGroup ${dom.user.name} ${pac.name}
     
@@ -99,27 +103,31 @@
 
     <Directory />
         SSLRequireSSL On
-	PassengerEnabled Off
+        PassengerEnabled Off
         Options -ExecCGI ${includes} ${indexes} ${multiviews} +SymLinksIfOwnerMatch
     </Directory>
 
     <Directory /home/doms/${dom.name}/>
         PassengerEnabled On
-        AllowOverride AuthConfig FileInfo Indexes Limit Options=IncludesNoExec,Indexes,MultiViews,PassengerNodejs,PassengerPython,PassengerRuby,PassengerAppEnv
+        AllowOverride AuthConfig FileInfo Indexes Limit Options=ExecCGI,IncludesNoExec,Indexes,MultiViews,SymLinksIfOwnerMatch,PassengerNodejs,PassengerPython,PassengerRuby,PassengerAppEnv
     </Directory>
 
     <Location /cgi-bin/>
         PassengerEnabled Off
         SetHandler cgi-script
-        Options +ExecCGI ${includes} -Indexes -MultiViews +SymLinksIfOwnerMatch
+        Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
 
     <Location /fastcgi-bin/>
-	PassengerEnabled Off
+        PassengerEnabled Off
         SetHandler fcgid-script
-        Options +ExecCGI ${includes} -Indexes -MultiViews +SymLinksIfOwnerMatch
+        Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
     
+#if( ${php5} )
+  FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
+
+#end
     RewriteEngine On
     RewriteOptions Inherit
     
@@ -130,8 +138,8 @@
 #end
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
     RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# -d
-    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1}$1 ]]# [last]    
-    
+    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1}$1 ]]# [last] 
+          
 #if( !${htdocsfallback} )
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
@@ -141,8 +149,8 @@
     RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?$ [novary]
     RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# !-d
     RewriteRule ^(.*) - [redirect=404,last]
+    
 #end
-
     AddType application/x-httpd-php .php .php5 .php4 .php3
     Action application/x-httpd-php /fastcgi-bin/phpstub
 

--
Gitblit v1.9.0-SNAPSHOT