diff --git a/deployment/btcpayserver/go.sh b/deployment/btcpayserver/go.sh index bbfcb0f..f4a2051 100755 --- a/deployment/btcpayserver/go.sh +++ b/deployment/btcpayserver/go.sh @@ -5,7 +5,6 @@ cd "$(dirname "$0")" export DOCKER_HOST="ssh://ubuntu@$BTCPAY_FQDN" -OPEN_URL=true RUN_SERVICES=true # we will re-run the btcpayserver provisioning scripts if directed to do so. @@ -27,7 +26,6 @@ elif [ "$RESTORE_BTCPAY" = true ]; then ./restore.sh RUN_SERVICES=true - OPEN_URL=true BACKUP_BTCPAY=false elif [ "$RECONFIGURE_BTCPAY_SERVER" == true ]; then @@ -36,7 +34,6 @@ elif [ "$RECONFIGURE_BTCPAY_SERVER" == true ]; then ./stub_btcpay_setup.sh RUN_SERVICES=true - OPEN_URL=true fi # if the script gets this far, then we grab a regular backup. @@ -49,13 +46,6 @@ if [ "$RUN_SERVICES" = true ] && [ "$STOP_SERVICES" = false ]; then # The default is to resume services, though admin may want to keep services off (eg., for a migration) # we bring the services back up by default. ssh "$FQDN" "bash -c $BTCPAY_SERVER_APPPATH/btcpay-up.sh" - - OPEN_URL=true - fi -if [ "$OPEN_URL" = true ]; then - if wait-for-it -t 5 "$PRIMARY_WWW_FQDN:80"; then - xdg-open "http://$PRIMARY_WWW_FQDN" > /dev/null 2>&1 - fi -fi +echo "FINISHED btcpayserver/go.sh" \ No newline at end of file diff --git a/deployment/deploy.sh b/deployment/deploy.sh index 677d169..cde73dc 100755 --- a/deployment/deploy.sh +++ b/deployment/deploy.sh @@ -3,6 +3,9 @@ set -ex cd "$(dirname "$0")" +LATEST_GIT_COMMIT="$(cat ../.git/refs/heads/master)" +export LATEST_GIT_COMMIT="$LATEST_GIT_COMMIT" + ./check_dependencies.sh DOMAIN_NAME= @@ -411,21 +414,19 @@ for DOMAIN_NAME in ${OTHER_SITES_LIST//,/ }; do stub_site_definition done + # now let's run the www and btcpay-specific provisioning scripts. if [ "$SKIP_WWW" = false ] && [ "$DEPLOY_BTCPAY_SERVER" = true ]; then bash -c "./www/go.sh" - ssh ubuntu@"$PRIMARY_WWW_FQDN" echo "$LATEST_GIT_COMMIT" > /home/ubuntu/.ss-githead + ssh ubuntu@"$PRIMARY_WWW_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead" fi -# -LATEST_GIT_COMMIT="$(cat ../.git/refs/heads/master)" -export LATEST_GIT_COMMIT="$LATEST_GIT_COMMIT" - export DOMAIN_NAME="$PRIMARY_DOMAIN" export SITE_PATH="$SITES_PATH/$DOMAIN_NAME" if [ "$SKIP_BTCPAY" = false ] && [ "$DEPLOY_BTCPAY_SERVER" = true ]; then bash -c "./btcpayserver/go.sh" - ssh ubuntu@"$BTCPAY_FQDN" echo "$LATEST_GIT_COMMIT" > /home/ubuntu/.ss-githead + + ssh ubuntu@"$BTCPAY_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead" fi # deploy clams wallet. @@ -441,4 +442,3 @@ if [ "$DEPLOY_BTCPAY_SERVER" = true ]; then fi - diff --git a/deployment/deploy_vms.sh b/deployment/deploy_vms.sh index e663108..2603b73 100755 --- a/deployment/deploy_vms.sh +++ b/deployment/deploy_vms.sh @@ -60,7 +60,3 @@ if [ "$VIRTUAL_MACHINE" = btcpayserver ]; then ./btcpayserver/stub_btcpay_setup.sh fi fi - - - -ssh "$PRIMARY_WWW_FQDN" -- echo "" \ No newline at end of file diff --git a/deployment/stub_lxc_profile.sh b/deployment/stub_lxc_profile.sh index 912d9b9..2be5849 100755 --- a/deployment/stub_lxc_profile.sh +++ b/deployment/stub_lxc_profile.sh @@ -37,12 +37,6 @@ EOF fi -# first of all, if there are uncommited changes, we quit. You better stash or commit! -# Remote VPS instances are tagged with your current git HEAD so we know which code revision -# used when provisioning the VPS. -LATEST_GIT_COMMIT="$(cat ../.git/refs/heads/master)" -export LATEST_GIT_COMMIT="$LATEST_GIT_COMMIT" - if [ "$LXD_HOSTNAME" = "$BASE_IMAGE_VM_NAME" ]; then # this is for the base image only... cat >> "$YAML_PATH" <