From 4bba0e9cc41056a9b35b8a5a3816f68a213dc1c4 Mon Sep 17 00:00:00 2001
From: Matthew Saunders Brown <msb@stackaas.com>
Date: Tue, 5 Oct 2021 13:22:39 -0700
Subject: [PATCH] alias macro fixes

---
 bin/vhost-enable.sh                   | 16 +++++++---------
 etc/apache2/mods-available/macro.conf | 24 ++++++++++++------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/bin/vhost-enable.sh b/bin/vhost-enable.sh
index 77c9738..65e7887 100755
--- a/bin/vhost-enable.sh
+++ b/bin/vhost-enable.sh
@@ -18,6 +18,8 @@ help()
   echo "  -d <domain>   Domain name of VirtualHost to remove."
   echo "  -m <macro>    Name of Apache macro to apply."
   echo "  -o <option>   Subdomain or Alias or Redirect URL if specified macro requires one."
+  echo "                For Alias domains '-d <domain>' is the alias domain, and '-o <alias>'"
+  echo "                is the existing VirtualHost to alias to."
   echo ""
   echo "                Available Apache Macros:"
   echo ""
@@ -121,8 +123,8 @@ if [[ "$macro" == *"VHost"* ]]; then
     if [ -n $option ]; then
       alias=$option
       # make sure Alias domain isn't already installed as it's own vhost
-      if [ -d "/srv/www/$alias" ]; then
-        echo "$alias is already installed as it's own vhost"
+      if [ -d "/srv/www/$domain" ]; then
+        echo "$domain is already installed as it's own vhost"
         exit 1
       else
         macro_vhost_line="$macro_vhost_line $alias"
@@ -164,13 +166,9 @@ fi
 
 # if https check for le cert
 if [[ "$macro" == *"HTTPS"* ]]; then
-  if [[ "$macro" == *"Alias"* ]]; then
-    cert_host="$alias"
-  else
-    cert_host=$domain
-    if [[ "$macro" == *"Subdomain"* ]]; then
-      cert_host="$subdomain.$cert_host"
-    fi
+  cert_host=$domain
+  if [[ "$macro" == *"Subdomain"* ]]; then
+    cert_host="$subdomain.$cert_host"
   fi
   if [[ ! -f "/etc/ssl/letsencrypt/$cert_host.pem" ]]; then
     echo "cert file for $cert_host does not exist"
diff --git a/etc/apache2/mods-available/macro.conf b/etc/apache2/mods-available/macro.conf
index 24e5804..da48346 100644
--- a/etc/apache2/mods-available/macro.conf
+++ b/etc/apache2/mods-available/macro.conf
@@ -201,10 +201,10 @@
 
 <Macro VHostAliasHTTP $vhost $username $alias>
   <VirtualHost *:80>
-    ServerName  $alias
-    ServerAlias www.$alias
-    ServerAlias $alias.example.com
-    DocumentRoot  /srv/www/$vhost/html
+    ServerName  $vhost
+    ServerAlias www.$vhost
+    ServerAlias $vhost.example.com
+    DocumentRoot  /srv/www/$alias/html
     <FilesMatch ".+\.ph(ar|p|tml)$">
       SetHandler "proxy:unix:/run/php/php7.4-fpm-$username.sock|fcgi://localhost"
     </FilesMatch>
@@ -213,10 +213,10 @@
 
 <Macro VHostAliasHTTPS $vhost $username $alias>
   <VirtualHost *:80>
-    ServerName  $alias
-    ServerAlias www.$alias
-    ServerAlias $alias.example.com
-    DocumentRoot  /srv/www/$vhost/html
+    ServerName  $vhost
+    ServerAlias www.$vhost
+    ServerAlias $vhost.example.com
+    DocumentRoot  /srv/www/$alias/html
 ##    <Location "/">
 ##      <If "%{REQUEST_URI} !~ m#^/.well-known/acme-challenge/#">
 ##        Redirect 301 "https://%{HTTP_HOST}%{REQUEST_URI}"
@@ -227,10 +227,10 @@
     </FilesMatch>
   </VirtualHost>
   <VirtualHost *:443>
-    ServerName    $alias
-    ServerAlias   www.$alias
-    ServerAlias   $alias.example.com
-    DocumentRoot  /srv/www/$vhost/html
+    ServerName    $vhost
+    ServerAlias   www.$vhost
+    ServerAlias   $vhost.example.com
+    DocumentRoot  /srv/www/$alias/html
     <FilesMatch ".+\.ph(ar|p|tml)$">
       SetHandler "proxy:unix:/run/php/php7.4-fpm-$username.sock|fcgi://localhost"
     </FilesMatch>