msb/vhost-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix call to AliasDomain var

Browse Source
This commit is contained in:
Matthew Saunders Brown 2024-11-27 09:55:02 -08:00
parent c741e26dab
commit c329b13c29
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
etc/apache2/mods-available/macro.conf
View File

@ -31,7 +31,7 @@
ServerName $vhost ServerName $vhost
ServerAlias www.$vhost ServerAlias www.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $vhost.$AliasDomain ServerAlias $vhost.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html DocumentRoot /srv/www/$vhost/html
ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/" ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@ -48,7 +48,7 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerName $subdomain.$vhost ServerName $subdomain.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $subdomain.$vhost.$AliasDomain ServerAlias $subdomain.$vhost.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html/$subdomain DocumentRoot /srv/www/$vhost/html/$subdomain
<FilesMatch ".+\.ph(ar|p|tml)$"> <FilesMatch ".+\.ph(ar|p|tml)$">
@ -57,13 +57,13 @@
</VirtualHost> </VirtualHost>
</Macro> </Macro>
# VHostHTTPS - HTTPS on Port 443. Inludes Port 80 and ServerAliases for $AliasDomain subdomain # VHostHTTPS - HTTPS on Port 443. Inludes Port 80 and ServerAliases for ${AliasDomain} subdomain
<Macro VHostHTTPS $vhost $username $phpVersion> <Macro VHostHTTPS $vhost $username $phpVersion>
<VirtualHost *:80> <VirtualHost *:80>
ServerName $vhost ServerName $vhost
ServerAlias www.$vhost ServerAlias www.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $vhost.$AliasDomain ServerAlias $vhost.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html DocumentRoot /srv/www/$vhost/html
ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/" ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@ -85,7 +85,7 @@
ServerName $vhost ServerName $vhost
ServerAlias www.$vhost ServerAlias www.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $vhost.$AliasDomain ServerAlias $vhost.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html DocumentRoot /srv/www/$vhost/html
ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/" ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@ -113,12 +113,12 @@
</VirtualHost> </VirtualHost>
</Macro> </Macro>
# VHostSubdomainHTTPS - HTTPS on Port 443. Inludes Port 80 and ServerAliases for $AliasDomain subdomain # VHostSubdomainHTTPS - HTTPS on Port 443. Inludes Port 80 and ServerAliases for ${AliasDomain} subdomain
<Macro VHostSubdomainHTTPS $vhost $username $phpVersion $subdomain> <Macro VHostSubdomainHTTPS $vhost $username $phpVersion $subdomain>
<VirtualHost *:80> <VirtualHost *:80>
ServerName $subdomain.$vhost ServerName $subdomain.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $subdomain.$vhost.$AliasDomain ServerAlias $subdomain.$vhost.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html/$subdomain DocumentRoot /srv/www/$vhost/html/$subdomain
<IfDefine ForceHTTPS> <IfDefine ForceHTTPS>
@ -135,7 +135,7 @@
<VirtualHost *:443> <VirtualHost *:443>
ServerName $subdomain.$vhost ServerName $subdomain.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $subdomain.$vhost.$AliasDomain ServerAlias $subdomain.$vhost.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html/$subdomain DocumentRoot /srv/www/$vhost/html/$subdomain
<FilesMatch ".+\.ph(ar|p|tml)$"> <FilesMatch ".+\.ph(ar|p|tml)$">
@ -152,7 +152,7 @@
ServerName $vhost ServerName $vhost
ServerAlias www.$vhost ServerAlias www.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $vhost.$AliasDomain ServerAlias $vhost.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html DocumentRoot /srv/www/$vhost/html
ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/" ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@ -167,7 +167,7 @@
ServerName $vhost ServerName $vhost
ServerAlias www.$vhost ServerAlias www.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $vhost.$AliasDomain ServerAlias $vhost.${AliasDomain}
</IfDefine> </IfDefine>
RequestHeader set X-Forwarded-Proto https RequestHeader set X-Forwarded-Proto https
ProxyPreserveHost On ProxyPreserveHost On
@ -183,7 +183,7 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerName $subdomain.$vhost ServerName $subdomain.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $subdomain.$vhost.$AliasDomain ServerAlias $subdomain.$vhost.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html/$subdomain DocumentRoot /srv/www/$vhost/html/$subdomain
<FilesMatch ".+\.ph(ar|p|tml)$"> <FilesMatch ".+\.ph(ar|p|tml)$">
@ -193,7 +193,7 @@
<VirtualHost *:443> <VirtualHost *:443>
ServerName $subdomain.$vhost ServerName $subdomain.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $subdomain.$vhost.$AliasDomain ServerAlias $subdomain.$vhost.${AliasDomain}
</IfDefine> </IfDefine>
RequestHeader set X-Forwarded-Proto https RequestHeader set X-Forwarded-Proto https
ProxyPreserveHost On ProxyPreserveHost On
@ -247,7 +247,7 @@
ServerName $vhost ServerName $vhost
ServerAlias www.$vhost ServerAlias www.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $vhost.$AliasDomain ServerAlias $vhost.${AliasDomain}
</IfDefine> </IfDefine>
<Location "/"> <Location "/">
<If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#"> <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
@ -262,7 +262,7 @@
ServerName $vhost ServerName $vhost
ServerAlias www.$vhost ServerAlias www.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $vhost.$AliasDomain ServerAlias $vhost.${AliasDomain}
</IfDefine> </IfDefine>
<Location "/"> <Location "/">
<If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#"> <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
@ -274,7 +274,7 @@
ServerName $vhost ServerName $vhost
ServerAlias www.$vhost ServerAlias www.$vhost
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $vhost.$AliasDomain ServerAlias $vhost.${AliasDomain}
</IfDefine> </IfDefine>
<Location "/"> <Location "/">
<If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#"> <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
@ -291,7 +291,7 @@
ServerName $alias ServerName $alias
ServerAlias www.$alias ServerAlias www.$alias
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $alias.$AliasDomain ServerAlias $alias.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html DocumentRoot /srv/www/$vhost/html
ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/" ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@ -309,7 +309,7 @@
ServerName $alias ServerName $alias
ServerAlias www.$alias ServerAlias www.$alias
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $alias.$AliasDomain ServerAlias $alias.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html DocumentRoot /srv/www/$vhost/html
ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/" ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@ -331,7 +331,7 @@
ServerName $alias ServerName $alias
ServerAlias www.$alias ServerAlias www.$alias
<IfDefine AliasDomain> <IfDefine AliasDomain>
ServerAlias $alias.$AliasDomain ServerAlias $alias.${AliasDomain}
</IfDefine> </IfDefine>
DocumentRoot /srv/www/$vhost/html DocumentRoot /srv/www/$vhost/html
ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/" ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"