From 60735b0578f384044b208e5dd456d2b0685ed6cc Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Tue, 13 Oct 2020 15:26:44 -0400
Subject: use the new name in more places

---
 selfpublish.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/selfpublish.sh b/selfpublish.sh
index 64ccd37..f244dbd 100644
--- a/selfpublish.sh
+++ b/selfpublish.sh
@@ -464,7 +464,6 @@ enable_apache_modules()
 
 site_conf_template()
 {
-        HOSTNAME=$(hostname)
 cat <<END
 <MDomain $DOMAIN>
         MDContactEmail webmaster@$DOMAIN
@@ -825,13 +824,13 @@ check_tls()
         curl -s -S -I https://"$1" >/dev/null
 }
 
+HOSTNAME=$(hostname)
 DEBDEST=$(realpath .)
 [ "$NO_EQUIVS" ] || equivocate >&2
 
 APACHE_MODULES='status md rewrite ssl include cgi'
 APACHE_SITE_DIRS='logs public_html'
 
-
 AUTH_TYPE=${1:-$DEFAULT_AUTH_TYPE}
 AUTH_KEYTAG=$(path_fragment_to_ssh_keytag "$AUTH_TYPE")
 DYNDNS=$(get_dyndns_domain "$AUTH_KEYTAG")
@@ -847,7 +846,7 @@ case "$DOMAIN" in
         exit 1 ;;
 esac
 
-check_tls "$DOMAIN"
+check_tls "$HOSTNAME.$DOMAIN"
 tls_result=$?
 
 install_apache_vhost
@@ -862,6 +861,6 @@ else
         systemctl reload apache2 || systemctl restart apache2
 fi
 
-check_tls "$DOMAIN"
-printf '%s\n' "https://$DOMAIN/selfpublish.sh"
+check_tls "$HOSTNAME.$DOMAIN"
+printf '%s\n' "https://$HOSTNAME.$DOMAIN/selfpublish.sh"
 
-- 
cgit v1.2.3