summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-09-14 16:56:39 -0400
committerAndrew Cady <d@jerkface.net>2020-09-14 16:56:39 -0400
commit4f29525793bdfc20eb11ce508a14c715544fdb46 (patch)
tree4ed8510ccf22716f161f7017a0ba3d4f8dad7e1e
parent78a2b651d48450c841d86fd9baa02dff1c4cdce8 (diff)
add support for new *.cryptonomic.net domain format
-rw-r--r--selfpublish.sh9
1 files 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 .)
481APACHE_MODULES='status md rewrite ssl include cgi' 481APACHE_MODULES='status md rewrite ssl include cgi'
482APACHE_SITE_DIRS='logs public_html' 482APACHE_SITE_DIRS='logs public_html'
483 483
484AUTH_TYPE=$(path_fragment_to_ssh_keytag "${1:-$DEFAULT_AUTH_TYPE}") 484
485DYNDNS=$(get_dyndns_domain "$AUTH_TYPE") 485AUTH_TYPE=${1:-$DEFAULT_AUTH_TYPE}
486AUTH_KEYTAG=$(path_fragment_to_ssh_keytag "$AUTH_TYPE")
487DYNDNS=$(get_dyndns_domain "$AUTH_KEYTAG")
486DOMAIN=${DYNDNS%% *} 488DOMAIN=${DYNDNS%% *}
487SITE_DIR=/srv/$DOMAIN 489SITE_DIR=/srv/$DOMAIN
488SITE_CONF=/etc/apache2/sites-available/$DOMAIN.conf 490SITE_CONF=/etc/apache2/sites-available/$DOMAIN.conf
489 491
490case "$DOMAIN" in 492case "$DOMAIN" in
493 *."$AUTH_KEYTAG".cryptonomic.net) ;;
491 *."$AUTH_TYPE".cryptonomic.net) ;; 494 *."$AUTH_TYPE".cryptonomic.net) ;;
492 *) 495 *)
493 printf 'Error: %s\n' "Unexpected domain returned by server: $DOMAIN" 496 printf 'Error: %s\n' "Unexpected domain returned by server: $DOMAIN (AUTH_TYPE=$AUTH_TYPE)"
494 exit 1 ;; 497 exit 1 ;;
495esac 498esac
496 499