From c8760279f076450504914710137863577817163f Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@samizdat>
Date: Tue, 28 Sep 2021 20:28:51 -0400
Subject: avoid code duplication by calling "cryptonomic dyndns"

---
 selfpublish.sh | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/selfpublish.sh b/selfpublish.sh
index 47adb59..521d9da 100644
--- a/selfpublish.sh
+++ b/selfpublish.sh
@@ -871,29 +871,20 @@ check_tls()
         set $flags
 }
 
-HOSTNAME=$(hostname --short)
 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")
-DOMAIN=${DYNDNS%% *}
-SITE_DIR=/srv/$DOMAIN
-SITE_CONF=/etc/apache2/sites-available/$DOMAIN.conf
-
-case "$DOMAIN" in
-    *."$AUTH_KEYTAG".cryptonomic.net) ;;
-    *."$AUTH_TYPE".cryptonomic.net) ;;
-    *)
-        printf 'Error: %s\n' "Unexpected domain returned by server: $DOMAIN (AUTH_TYPE=$AUTH_TYPE)"
-        exit 1 ;;
-esac
-
-check_tls "$HOSTNAME.$DOMAIN"
+HOSTNAME=$(hostname --short)
+DOMAIN=$(cryptonomic hostname)
+cryptonomic dyndns
+
+SITE_DIR=/srv/${DOMAIN#$HOSTNAME.}
+SITE_CONF=/etc/apache2/sites-available/${DOMAIN#$HOSTNAME.}.conf
+
+check_tls "$DOMAIN"
 tls_result=$?
 
 install_apache_vhost
@@ -908,6 +899,6 @@ else
         systemctl reload apache2 || systemctl restart apache2
 fi
 
-check_tls "$HOSTNAME.$DOMAIN"
-printf '%s\n' "https://$HOSTNAME.$DOMAIN/selfpublish.sh"
+check_tls "$DOMAIN"
+printf '%s\n' "https://$DOMAIN/selfpublish.sh"
 
-- 
cgit v1.2.3