From c329b13c29df9caad0978a316bcee485c9a0efa3 Mon Sep 17 00:00:00 2001
From: Matthew Saunders Brown <matthewsaundersbrown@gmail.com>
Date: Wed, 27 Nov 2024 09:55:02 -0800
Subject: [PATCH] fix call to AliasDomain var

---
 etc/apache2/mods-available/macro.conf | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/etc/apache2/mods-available/macro.conf b/etc/apache2/mods-available/macro.conf
index be93bbb..483c0f3 100644
--- a/etc/apache2/mods-available/macro.conf
+++ b/etc/apache2/mods-available/macro.conf
@@ -31,7 +31,7 @@
     ServerName  $vhost
     ServerAlias www.$vhost
     <IfDefine AliasDomain>
-      ServerAlias $vhost.$AliasDomain
+      ServerAlias $vhost.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@@ -48,7 +48,7 @@
   <VirtualHost *:80>
     ServerName  $subdomain.$vhost
     <IfDefine AliasDomain>
-      ServerAlias $subdomain.$vhost.$AliasDomain
+      ServerAlias $subdomain.$vhost.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html/$subdomain
     <FilesMatch ".+\.ph(ar|p|tml)$">
@@ -57,13 +57,13 @@
   </VirtualHost>
 </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>
   <VirtualHost *:80>
     ServerName  $vhost
     ServerAlias www.$vhost
     <IfDefine AliasDomain>
-      ServerAlias $vhost.$AliasDomain
+      ServerAlias $vhost.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@@ -85,7 +85,7 @@
     ServerName    $vhost
     ServerAlias   www.$vhost
     <IfDefine AliasDomain>
-      ServerAlias   $vhost.$AliasDomain
+      ServerAlias   $vhost.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@@ -113,12 +113,12 @@
   </VirtualHost>
 </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>
   <VirtualHost *:80>
     ServerName  $subdomain.$vhost
     <IfDefine AliasDomain>
-      ServerAlias $subdomain.$vhost.$AliasDomain
+      ServerAlias $subdomain.$vhost.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html/$subdomain
     <IfDefine ForceHTTPS>
@@ -135,7 +135,7 @@
   <VirtualHost *:443>
     ServerName    $subdomain.$vhost
     <IfDefine AliasDomain>
-      ServerAlias   $subdomain.$vhost.$AliasDomain
+      ServerAlias   $subdomain.$vhost.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html/$subdomain
     <FilesMatch ".+\.ph(ar|p|tml)$">
@@ -152,7 +152,7 @@
     ServerName  $vhost
     ServerAlias www.$vhost
     <IfDefine AliasDomain>
-      ServerAlias $vhost.$AliasDomain
+      ServerAlias $vhost.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@@ -167,7 +167,7 @@
     ServerName    $vhost
     ServerAlias   www.$vhost
     <IfDefine AliasDomain>
-      ServerAlias   $vhost.$AliasDomain
+      ServerAlias   $vhost.${AliasDomain}
     </IfDefine>
     RequestHeader set X-Forwarded-Proto https
     ProxyPreserveHost       On
@@ -183,7 +183,7 @@
   <VirtualHost *:80>
     ServerName  $subdomain.$vhost
     <IfDefine AliasDomain>
-      ServerAlias $subdomain.$vhost.$AliasDomain
+      ServerAlias $subdomain.$vhost.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html/$subdomain
     <FilesMatch ".+\.ph(ar|p|tml)$">
@@ -193,7 +193,7 @@
   <VirtualHost *:443>
     ServerName    $subdomain.$vhost
     <IfDefine AliasDomain>
-      ServerAlias   $subdomain.$vhost.$AliasDomain
+      ServerAlias   $subdomain.$vhost.${AliasDomain}
     </IfDefine>
     RequestHeader set X-Forwarded-Proto https
     ProxyPreserveHost       On
@@ -247,7 +247,7 @@
     ServerName  $vhost
     ServerAlias www.$vhost
     <IfDefine AliasDomain>
-      ServerAlias $vhost.$AliasDomain
+      ServerAlias $vhost.${AliasDomain}
     </IfDefine>
     <Location "/">
       <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
@@ -262,7 +262,7 @@
     ServerName  $vhost
     ServerAlias www.$vhost
     <IfDefine AliasDomain>
-      ServerAlias $vhost.$AliasDomain
+      ServerAlias $vhost.${AliasDomain}
     </IfDefine>
     <Location "/">
       <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
@@ -274,7 +274,7 @@
     ServerName  $vhost
     ServerAlias www.$vhost
     <IfDefine AliasDomain>
-      ServerAlias $vhost.$AliasDomain
+      ServerAlias $vhost.${AliasDomain}
     </IfDefine>
     <Location "/">
       <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
@@ -291,7 +291,7 @@
     ServerName  $alias
     ServerAlias www.$alias
     <IfDefine AliasDomain>
-      ServerAlias $alias.$AliasDomain
+      ServerAlias $alias.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@@ -309,7 +309,7 @@
     ServerName  $alias
     ServerAlias www.$alias
     <IfDefine AliasDomain>
-      ServerAlias $alias.$AliasDomain
+      ServerAlias $alias.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"
@@ -331,7 +331,7 @@
     ServerName    $alias
     ServerAlias   www.$alias
     <IfDefine AliasDomain>
-      ServerAlias $alias.$AliasDomain
+      ServerAlias $alias.${AliasDomain}
     </IfDefine>
     DocumentRoot  /srv/www/$vhost/html
     ScriptAlias /cgi-wrap/ "/usr/local/lib/cgi-wrap/$vhost/"