hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

New domain options and properties for Debian Bookworm #1

Closed
hsh-timotheuspokorra wants to merge 41 commits from TP-202311-vhost-bookworm into rel_4.0
pull from: TP-202311-vhost-bookworm
merge into: hostsharing:rel_4.0
Conversation 1 Commits 41 Files Changed 20 +12 -2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b16ba63833 - Show all commits

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

@ -81,8 +81,12 @@
RewriteEngine On RewriteEngine On
RewriteOptions Inherit RewriteOptions Inherit
#if( ${cgi} )
RewriteCond %{REQUEST_URI} !^/cgi-bin/ RewriteCond %{REQUEST_URI} !^/cgi-bin/
#end
#if( ${fastcgi} )
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/ RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
#end
RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary] RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# -d RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# -d
RewriteRule ^(.*) /home/doms/${dom.name}/subs/#[[${tolower:%1}$1 ]]# [last] RewriteRule ^(.*) /home/doms/${dom.name}/subs/#[[${tolower:%1}$1 ]]# [last]
@ -95,11 +99,13 @@
RewriteRule ^(.*) - [redirect=404,last] RewriteRule ^(.*) - [redirect=404,last]
#end #end
#if( ${fastcgi} )
#if( ${fcgiphpbin} ) #if( ${fcgiphpbin} )
FcgidInitialEnv HTTP_PHP_BIN ${fcgiphpbin} FcgidInitialEnv HTTP_PHP_BIN ${fcgiphpbin}
#end #end
AddType application/x-httpd-php .php AddType application/x-httpd-php .php
Action application/x-httpd-php /fastcgi-bin/phpstub Action application/x-httpd-php /fastcgi-bin/phpstub
#end
</VirtualHost> </VirtualHost>
<VirtualHost ${pac.curINetAddr.inet4Addr}:443 ${pac.oldINetAddr.inet4Addr}:443 [${pac.curINetAddr.inet6Addr}]:443 [${pac.oldINetAddr.inet6Addr}]:443> <VirtualHost ${pac.curINetAddr.inet4Addr}:443 ${pac.oldINetAddr.inet4Addr}:443 [${pac.curINetAddr.inet6Addr}]:443 [${pac.oldINetAddr.inet6Addr}]:443>
@ -186,8 +192,12 @@
RewriteEngine On RewriteEngine On
RewriteOptions Inherit RewriteOptions Inherit
#if( ${cgi} )
RewriteCond %{REQUEST_URI} !^/cgi-bin/ RewriteCond %{REQUEST_URI} !^/cgi-bin/
#end
#if( ${fastcgi} )
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/ RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
#end
RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary] RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# -d RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# -d
RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1}$1 ]]# [last] RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1}$1 ]]# [last]
@ -200,11 +210,11 @@
RewriteRule ^(.*) - [redirect=404,last] RewriteRule ^(.*) - [redirect=404,last]
#end #end
#if( ${fastcgi} )
#if( ${fcgiphpbin} ) #if( ${fcgiphpbin} )
FcgidInitialEnv HTTP_PHP_BIN ${fcgiphpbin} FcgidInitialEnv HTTP_PHP_BIN ${fcgiphpbin}
#end #end
AddType application/x-httpd-php .php AddType application/x-httpd-php .php
Action application/x-httpd-php /fastcgi-bin/phpstub Action application/x-httpd-php /fastcgi-bin/phpstub
#end
</VirtualHost> </VirtualHost>