From 767f47fe7fb40175ac40dcead455f6dd9f504f2f Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Wed, 17 Jan 2024 11:48:05 +0100
Subject: [PATCH] apache-vhost review

---
 .../de/hsadmin/mods/dom/apache-vhost.vm       | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm
index bcc9467..f5be01b 100644
--- a/hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm
+++ b/hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm
@@ -17,8 +17,12 @@
 
     DocumentRoot /home/doms/${dom.name}/htdocs
 
+#if( ${cgi} )
     Alias /cgi-bin/ /home/doms/${dom.name}/cgi/
+#end
+#if( ${fastcgi} )
     Alias /fastcgi-bin/ /home/doms/${dom.name}/fastcgi/
+#end
 
     <Directory />
         PassengerEnabled Off
@@ -33,6 +37,15 @@
 #end
 #if( ${passengerfriendlyerrorpages} )
         PassengerFriendlyErrorPages On
+#end
+#if( ${passengerpython} )
+        PassengerPython ${passengerpython}
+#end
+#if( ${passengernodejs} )
+        PassengerNodejs ${passengernodejs}
+#end
+#if( ${passengerruby} )
+        PassengerRuby ${passengerruby}
 #end
         AllowOverride AuthConfig FileInfo Indexes Limit Options=ExecCGI,IncludesNoExec,Indexes,MultiViews,SymLinksIfOwnerMatch,PassengerNodejs,PassengerPython,PassengerRuby,PassengerAppEnv
     </Directory>
@@ -82,7 +95,10 @@
     RewriteRule ^(.*) - [redirect=404,last]
 
 #end
-    AddType application/x-httpd-php .php .php5 .php4 .php3
+#if( ${fcgiphpbin} )
+    SetEnv HTTP_PHP_BIN ${fcgiphpbin}
+#end
+    AddType application/x-httpd-php .php 
     Action application/x-httpd-php /fastcgi-bin/phpstub
 </VirtualHost>
 
@@ -105,8 +121,12 @@
 
     DocumentRoot /home/doms/${dom.name}/htdocs-ssl
 
+#if( ${cgi} )
     Alias /cgi-bin/ /home/doms/${dom.name}/cgi-ssl/
+#end
+#if( ${fastcgi} )
     Alias /fastcgi-bin/ /home/doms/${dom.name}/fastcgi-ssl/
+#end
 
     <Directory />
         SSLRequireSSL On
@@ -124,13 +144,13 @@
         PassengerFriendlyErrorPages On
 #end
 #if( ${passengerpython} )
-        PassengerPython /home/pacs/${pac.name}/users/${dom.user.name}/${passengerpython}
+        PassengerPython ${passengerpython}
 #end
 #if( ${passengernodejs} )
-        PassengerNodejs /home/pacs/${pac.name}/users/${dom.user.name}/${passengernodejs}
+        PassengerNodejs ${passengernodejs}
 #end
 #if( ${passengerruby} )
-        PassengerRuby /home/pacs/${pac.name}/users/${dom.user.name}/${passengerruby}
+        PassengerRuby ${passengerruby}
 #end
         AllowOverride AuthConfig FileInfo Indexes Limit Options=ExecCGI,IncludesNoExec,Indexes,MultiViews,SymLinksIfOwnerMatch,PassengerNodejs,PassengerPython,PassengerRuby,PassengerAppEnv
     </Directory>
@@ -182,9 +202,9 @@
 #end
 
 #if( ${fcgiphpbin} )
-        SetEnv HTTP_PHP_BIN ${fcgiphpbin}
+    SetEnv HTTP_PHP_BIN ${fcgiphpbin}
 #end
-    AddType application/x-httpd-php .php .php5 .php4 .php3
+    AddType application/x-httpd-php .php
     Action application/x-httpd-php /fastcgi-bin/phpstub
 
 </VirtualHost>