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 |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
index 4e1c8c1..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
+        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
     </Location>
 
     <Location /fastcgi-bin/>
-		PassengerEnabled Off
+        PassengerEnabled Off
         SetHandler fcgid-script
         Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
 
+#if( ${php5} )
+    FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
+
+#end
     RewriteEngine On
     RewriteOptions Inherit
 
@@ -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,7 +103,7 @@
 
     <Directory />
         SSLRequireSSL On
-	PassengerEnabled Off
+        PassengerEnabled Off
         Options -ExecCGI ${includes} ${indexes} ${multiviews} +SymLinksIfOwnerMatch
     </Directory>
 
@@ -115,11 +119,15 @@
     </Location>
 
     <Location /fastcgi-bin/>
-	PassengerEnabled Off
+        PassengerEnabled Off
         SetHandler fcgid-script
         Options +ExecCGI -Includes -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
     
+#if( ${php5} )
+  FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php5
+
+#end
     RewriteEngine On
     RewriteOptions Inherit
     

--
Gitblit v1.9.0-SNAPSHOT