diff options
author | Andrew Cady <d@jerkface.net> | 2020-09-14 16:56:39 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2020-09-14 16:56:39 -0400 |
commit | 4f29525793bdfc20eb11ce508a14c715544fdb46 (patch) | |
tree | 4ed8510ccf22716f161f7017a0ba3d4f8dad7e1e | |
parent | 78a2b651d48450c841d86fd9baa02dff1c4cdce8 (diff) |
add support for new *.cryptonomic.net domain format
-rw-r--r-- | selfpublish.sh | 9 |
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 .) | |||
481 | APACHE_MODULES='status md rewrite ssl include cgi' | 481 | APACHE_MODULES='status md rewrite ssl include cgi' |
482 | APACHE_SITE_DIRS='logs public_html' | 482 | APACHE_SITE_DIRS='logs public_html' |
483 | 483 | ||
484 | AUTH_TYPE=$(path_fragment_to_ssh_keytag "${1:-$DEFAULT_AUTH_TYPE}") | 484 | |
485 | DYNDNS=$(get_dyndns_domain "$AUTH_TYPE") | 485 | AUTH_TYPE=${1:-$DEFAULT_AUTH_TYPE} |
486 | AUTH_KEYTAG=$(path_fragment_to_ssh_keytag "$AUTH_TYPE") | ||
487 | DYNDNS=$(get_dyndns_domain "$AUTH_KEYTAG") | ||
486 | DOMAIN=${DYNDNS%% *} | 488 | DOMAIN=${DYNDNS%% *} |
487 | SITE_DIR=/srv/$DOMAIN | 489 | SITE_DIR=/srv/$DOMAIN |
488 | SITE_CONF=/etc/apache2/sites-available/$DOMAIN.conf | 490 | SITE_CONF=/etc/apache2/sites-available/$DOMAIN.conf |
489 | 491 | ||
490 | case "$DOMAIN" in | 492 | case "$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 ;; |
495 | esac | 498 | esac |
496 | 499 | ||