hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm

@@ -17,12 +17,8 @@
 
     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
@@ -37,15 +33,6 @@
 #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>
@@ -95,10 +82,7 @@
     RewriteRule ^(.*) - [redirect=404,last]
 
 #end
-#if( ${fcgiphpbin} )
+    AddType application/x-httpd-php .php .php5 .php4 .php3
-    SetEnv HTTP_PHP_BIN ${fcgiphpbin}
-#end
-    AddType application/x-httpd-php .php 
     Action application/x-httpd-php /fastcgi-bin/phpstub
 </VirtualHost>
 
@@ -121,12 +105,8 @@
 
     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
@@ -144,13 +124,13 @@
         PassengerFriendlyErrorPages On
 #end
 #if( ${passengerpython} )
-        PassengerPython ${passengerpython}
+        PassengerPython /home/pacs/${pac.name}/users/${dom.user.name}/${passengerpython}
 #end
 #if( ${passengernodejs} )
-        PassengerNodejs ${passengernodejs}
+        PassengerNodejs /home/pacs/${pac.name}/users/${dom.user.name}/${passengernodejs}
 #end
 #if( ${passengerruby} )
-        PassengerRuby ${passengerruby}
+        PassengerRuby /home/pacs/${pac.name}/users/${dom.user.name}/${passengerruby}
 #end
         AllowOverride AuthConfig FileInfo Indexes Limit Options=ExecCGI,IncludesNoExec,Indexes,MultiViews,SymLinksIfOwnerMatch,PassengerNodejs,PassengerPython,PassengerRuby,PassengerAppEnv
     </Directory>
@@ -202,9 +182,9 @@
 #end
 
 #if( ${fcgiphpbin} )
-    SetEnv HTTP_PHP_BIN ${fcgiphpbin}
+        SetEnv HTTP_PHP_BIN ${fcgiphpbin}
 #end
-    AddType application/x-httpd-php .php
+    AddType application/x-httpd-php .php .php5 .php4 .php3
     Action application/x-httpd-php /fastcgi-bin/phpstub
 
 </VirtualHost>