Compare commits

..

No commits in common. "92be4acd7f8707dcee39afbe25c6dcd188c919f6" and "73f47dfb47ec03d0c7f8e406f3792335dde2cdba" have entirely different histories.

View File

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