apache server alias for the dns name w/ hostname as label

1 files changed, 11 insertions, 3 deletions

diff --git a/selfpublish.sh b/selfpublish.sh
index 3256c5b..bbef8cc 100644
--- a/selfpublish.sh
+++ b/selfpublish.sh
@@ -461,22 +461,30 @@ enable_apache_modules()
 
 site_conf_template()
 {
+        HOSTNAME=$(hostname)
 cat <<END
 <MDomain $DOMAIN>
         MDContactEmail webmaster@$DOMAIN
         MDCertificateAgreement accepted
         MDRequireHttps temporary
+        MDMember $HOSTNAME.$DOMAIN
 </MDomain>
 <VirtualHost *:80>
         ServerName $DOMAIN
-        ServerAlias ${DOMAIN}.
+        ServerAlias $DOMAIN.
         Redirect / https://$DOMAIN
 </VirtualHost>
+<VirtualHost *:80>
+        ServerAlias $HOSTNAME.$DOMAIN
+        ServerAlias $HOSTNAME.$DOMAIN.
+        Redirect / https://$HOSTNAME.$DOMAIN
+</VirtualHost>
 
 <VirtualHost *:443>
-        ServerName $DOMAIN
+        ServerName $HOSTNAME.$DOMAIN
+        ServerAlias $DOMAIN
 
-        ServerAdmin webmaster@$DOMAIN
+        ServerAdmin webmaster@$HOSTNAME.$DOMAIN
         SSLEngine on
 
         ErrorLog /srv/$DOMAIN/logs/error.log