From 4d57865ae902ad2891b27d6ac00512de319ba210 Mon Sep 17 00:00:00 2001
From: Matthew Saunders Brown <msb@stackaas.com>
Date: Thu, 21 Jul 2022 15:06:41 -0700
Subject: [PATCH] add AliasDomain variable

---
 etc/apache2/mods-available/macro.conf | 75 ++++++++++++++++++++-------
 1 file changed, 56 insertions(+), 19 deletions(-)

diff --git a/etc/apache2/mods-available/macro.conf b/etc/apache2/mods-available/macro.conf
index d30c9da..7911495 100644
--- a/etc/apache2/mods-available/macro.conf
+++ b/etc/apache2/mods-available/macro.conf
@@ -17,12 +17,19 @@
 # VHostAliasHTTPSVarnish for http & https
 # *only use one of the Alias options above at at time*
 
-# VHostHTTP - HTTP on Port 80. Includes ServerAlias for .example.com subdomain
+
+# Optional AliasDomain for accessing VirtualHosts.
+# Uncomment and change example.com to suit your needs.
+#Define AliasDomain example.com
+
+# VHostHTTP - HTTP on Port 80
 <Macro VHostHTTP $vhost $username>
   <VirtualHost *:80>
     ServerName  $vhost
     ServerAlias www.$vhost
-    ServerAlias $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
     RewriteEngine on
@@ -37,7 +44,9 @@
 <Macro VHostSubdomainHTTP $vhost $username $subdomain>
   <VirtualHost *:80>
     ServerName  $subdomain.$vhost
-    ServerAlias $subdomain.$vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $subdomain.$vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$vhost/$subdomain
     <FilesMatch ".+\.ph(ar|p|tml)$">
       SetHandler "proxy:unix:/run/php/php7.4-fpm-$username.sock|fcgi://localhost"
@@ -45,12 +54,14 @@
   </VirtualHost>
 </Macro>
 
-# VHostHTTPS - HTTPS on Port 443. Inludes Port 80 and ServerAliases for .example.com subdomain
+# VHostHTTPS - HTTPS on Port 443. Inludes Port 80 and ServerAliases for ${AliasDomain} subdomain
 <Macro VHostHTTPS $vhost $username>
   <VirtualHost *:80>
     ServerName  $vhost
     ServerAlias www.$vhost
-    ServerAlias $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
     RewriteEngine on
@@ -68,7 +79,9 @@
   <VirtualHost *:443>
     ServerName    $vhost
     ServerAlias   www.$vhost
-    ServerAlias   $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias   $vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
     RewriteEngine on
@@ -95,11 +108,13 @@
   </VirtualHost>
 </Macro>
 
-# VHostSubdomainHTTPS - HTTPS on Port 443. Inludes Port 80 and ServerAliases for .example.com subdomain
+# VHostSubdomainHTTPS - HTTPS on Port 443. Inludes Port 80 and ServerAliases for ${AliasDomain} subdomain
 <Macro VHostSubdomainHTTPS $vhost $username $subdomain>
   <VirtualHost *:80>
     ServerName  $subdomain.$vhost
-    ServerAlias $subdomain.$vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $subdomain.$vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$vhost/$subdomain
 ##    <Location "/">
 ##      <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
@@ -112,7 +127,9 @@
   </VirtualHost>
   <VirtualHost *:443>
     ServerName    $subdomain.$vhost
-    ServerAlias   $subdomain.$vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias   $subdomain.$vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$vhost/$subdomain
     <FilesMatch ".+\.ph(ar|p|tml)$">
       SetHandler "proxy:unix:/run/php/php7.4-fpm-$username.sock|fcgi://localhost"
@@ -127,7 +144,9 @@
   <VirtualHost *:80>
     ServerName  $vhost
     ServerAlias www.$vhost
-    ServerAlias $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
     RewriteEngine on
@@ -140,7 +159,9 @@
   <VirtualHost *:443>
     ServerName    $vhost
     ServerAlias   www.$vhost
-    ServerAlias   $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias   $vhost.${AliasDomain}
+    </IfDefine>
     RequestHeader set X-Forwarded-Proto https
     ProxyPreserveHost       On
     ProxyPass               / http://127.0.0.1:6081/
@@ -154,7 +175,9 @@
 <Macro VHostSubdomainHTTPSVarnish $vhost $username $subdomain>
   <VirtualHost *:80>
     ServerName  $subdomain.$vhost
-    ServerAlias $subdomain.$vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $subdomain.$vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$vhost/$subdomain
     <FilesMatch ".+\.ph(ar|p|tml)$">
       SetHandler "proxy:unix:/run/php/php7.4-fpm-$username.sock|fcgi://localhost"
@@ -162,7 +185,9 @@
   </VirtualHost>
   <VirtualHost *:443>
     ServerName    $subdomain.$vhost
-    ServerAlias   $subdomain.$vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias   $subdomain.$vhost.${AliasDomain}
+    </IfDefine>
     RequestHeader set X-Forwarded-Proto https
     ProxyPreserveHost       On
     ProxyPass               / http://127.0.0.1:6081/
@@ -194,7 +219,9 @@
   <VirtualHost *:80>
     ServerName  $vhost
     ServerAlias www.$vhost
-    ServerAlias $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $vhost.${AliasDomain}
+    </IfDefine>
     <Location "/">
       <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
         Redirect 301 "$redirect%{REQUEST_URI}"
@@ -207,7 +234,9 @@
   <VirtualHost *:80>
     ServerName  $vhost
     ServerAlias www.$vhost
-    ServerAlias $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $vhost.${AliasDomain}
+    </IfDefine>
     <Location "/">
       <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
         Redirect 301 "$redirect%{REQUEST_URI}"
@@ -217,7 +246,9 @@
   <VirtualHost *:443>
     ServerName  $vhost
     ServerAlias www.$vhost
-    ServerAlias $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $vhost.${AliasDomain}
+    </IfDefine>
     <Location "/">
       <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
         Redirect 301 "$redirect%{REQUEST_URI}"
@@ -232,7 +263,9 @@
   <VirtualHost *:80>
     ServerName  $vhost
     ServerAlias www.$vhost
-    ServerAlias $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$alias/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$alias/"
     RewriteEngine on
@@ -248,7 +281,9 @@
   <VirtualHost *:80>
     ServerName  $vhost
     ServerAlias www.$vhost
-    ServerAlias $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$alias/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$alias/"
     RewriteEngine on
@@ -266,7 +301,9 @@
   <VirtualHost *:443>
     ServerName    $vhost
     ServerAlias   www.$vhost
-    ServerAlias   $vhost.example.com
+    <IfDefine AliasDomain>
+      ServerAlias $vhost.${AliasDomain}
+    </IfDefine>
     DocumentRoot  /srv/www/$alias/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$alias/"
     RewriteEngine on