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

add autoconfig to vhost template

Browse Source
This commit is contained in:
Peter Hormanns 2019-12-03 19:22:34 +01:00
parent fad4022cd5
commit b294f974d7
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
View File

@ -6,6 +6,9 @@
<VirtualHost ${pac.curINetAddr.inet4Addr}:80 ${pac.oldINetAddr.inet4Addr}:80 [${pac.curINetAddr.inet6Addr}]:80 [${pac.oldINetAddr.inet6Addr}]:80> <VirtualHost ${pac.curINetAddr.inet4Addr}:80 ${pac.oldINetAddr.inet4Addr}:80 [${pac.curINetAddr.inet6Addr}]:80 [${pac.oldINetAddr.inet6Addr}]:80>
ServerName ${dom.name} ServerName ${dom.name}
ServerAlias ${dom.serveraliases} ServerAlias ${dom.serveraliases}
#if( ${autoconfig} )
ServerAlias autoconfig.${dom.name}
#end
ServerAdmin webmaster@${dom.name} ServerAdmin webmaster@${dom.name}
SuexecUserGroup ${dom.user.name} ${pac.name} SuexecUserGroup ${dom.user.name} ${pac.name}
@ -45,13 +48,13 @@
Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch
</Location> </Location>
#if( ${phplatest} )
FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php7.3
#end
RewriteEngine On RewriteEngine On
RewriteOptions Inherit RewriteOptions Inherit
#if( ${autoconfig} )
RewriteRule ^/mail/config-v1.1.xml$ ajp://config.hostsharing.net:8009/hsar/config-v1.1.xml [proxy,last]
#end
RewriteCond %{REQUEST_URI} !^/cgi-bin/ RewriteCond %{REQUEST_URI} !^/cgi-bin/
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/ RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
#if( ${letsencrypt} ) #if( ${letsencrypt} )
@ -79,6 +82,9 @@
<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>
ServerName ${dom.name} ServerName ${dom.name}
ServerAlias ${dom.serveraliases} ServerAlias ${dom.serveraliases}
#if( ${autoconfig} )
ServerAlias autoconfig.${dom.name}
#end
ServerAdmin webmaster@${dom.name} ServerAdmin webmaster@${dom.name}
SuexecUserGroup ${dom.user.name} ${pac.name} SuexecUserGroup ${dom.user.name} ${pac.name}
@ -124,13 +130,13 @@
Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch
</Location> </Location>
#if( ${phplatest} )
FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php7.3
#end
RewriteEngine On RewriteEngine On
RewriteOptions Inherit RewriteOptions Inherit
#if( ${autoconfig} )
RewriteRule ^/mail/config-v1.1.xml$ ajp://config.hostsharing.net:8009/hsar/config-v1.1.xml [proxy,last]
#end
RewriteCond %{REQUEST_URI} !^/cgi-bin/ RewriteCond %{REQUEST_URI} !^/cgi-bin/
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/ RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
#if( ${letsencrypt} ) #if( ${letsencrypt} )