From 4f29525793bdfc20eb11ce508a14c715544fdb46 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Mon, 14 Sep 2020 16:56:39 -0400 Subject: add support for new *.cryptonomic.net domain format --- selfpublish.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/selfpublish.sh b/selfpublish.sh index d2bc577..5e43f7a 100644 --- a/selfpublish.sh +++ b/selfpublish.sh @@ -481,16 +481,19 @@ DEBDEST=$(realpath .) APACHE_MODULES='status md rewrite ssl include cgi' APACHE_SITE_DIRS='logs public_html' -AUTH_TYPE=$(path_fragment_to_ssh_keytag "${1:-$DEFAULT_AUTH_TYPE}") -DYNDNS=$(get_dyndns_domain "$AUTH_TYPE") + +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" + printf 'Error: %s\n' "Unexpected domain returned by server: $DOMAIN (AUTH_TYPE=$AUTH_TYPE)" exit 1 ;; esac -- cgit v1.2.3