Merge branch 'TP-202311-vhost-bookworm' of hsh04-dev@dev.hostsharing.net:hostsharing/hs.hsadmin.git into TP-202311-vhost-bookworm

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>