From 73ec75a9f2674e3e4d64853713c16a3d5bd34ca0 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Tue, 4 Apr 2023 11:10:38 -0400 Subject: [PATCH] The rest of it. --- deploy.sh | 3 --- www/go.sh | 21 ++++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/deploy.sh b/deploy.sh index 1e940f2..be8f6a1 100755 --- a/deploy.sh +++ b/deploy.sh @@ -50,7 +50,6 @@ REMOTE_NAME="$(lxc remote get-default)" STOP_SERVICES=false USER_SAYS_YES=false RESTART_FRONT_END=true -USER_TARGET_PROJECT= # grab any modifications from the command line. for i in "$@"; do @@ -64,7 +63,6 @@ for i in "$@"; do RESTORE_CERTS=true BACKUP_APPS=false RUN_CERT_RENEWAL=false - RESTART_FRONT_END=true shift ;; --restore-btcpay) @@ -303,7 +301,6 @@ stub_site_definition # bring the VMs up under the primary domain name. export UPDATE_BTCPAY="$UPDATE_BTCPAY" -export RECONFIGURE_BTCPAY_SERVER="$RECONFIGURE_BTCPAY_SERVER" # iterate over all our server endpoints and provision them if needed. # www diff --git a/www/go.sh b/www/go.sh index 38ef5d1..a9e9231 100755 --- a/www/go.sh +++ b/www/go.sh @@ -60,6 +60,15 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do fi fi + + if [ "$DEPLOY_NOSTR" = true ]; then + if [ -z "$NOSTR_ACCOUNT_PUBKEY" ]; then + echo "ERROR: When deploying nostr, you MUST specify NOSTR_ACCOUNT_PUBKEY." + exit 1 + fi + fi + + if [ -z "$DUPLICITY_BACKUP_PASSPHRASE" ]; then echo "ERROR: Ensure DUPLICITY_BACKUP_PASSPHRASE is configured in your site.conf." exit 1 @@ -85,16 +94,6 @@ fi # ok, the backend stacks are stopped. if [ "$RESTART_FRONT_END" = true ]; then - # remove the nginx stack - if docker stack list --format "{{.Name}}" | grep -q reverse-proxy; then - sleep 2 - - docker stack rm reverse-proxy - - # wait for all docker containers to stop. - # TODO see if there's a way to check for this. - sleep 20 - fi # generate the certs and grab a backup if [ "$RUN_CERT_RENEWAL" = true ] && [ "$RESTORE_CERTS" = false ]; then @@ -115,7 +114,7 @@ if [ "$RESTART_FRONT_END" = true ]; then source ../domain_env.sh # these variable are used by both backup/restore scripts. - export REMOTE_BACKUP_PATH="$REMOTE_HOME/backups/www/$APP/$DOMAIN_IDENTIFIER" + export REMOTE_BACKUP_PATH="$REMOTE_BACKUP_PATH/www/$APP/$DOMAIN_IDENTIFIER" export REMOTE_SOURCE_BACKUP_PATH="$REMOTE_DATA_PATH/$APP/$DOMAIN_NAME" # ensure our local backup path exists so we can pull down the duplicity archive to the management machine.