From 25f556184801358ea10d2af6d9327a3ba3a983d9 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Mon, 15 Aug 2022 09:39:10 -0400
Subject: [PATCH] More formatting and control updates.

---
 archive/umbrel/go.sh                   | 51 --------------------------
 cluster.sh                             |  2 +-
 deployment/btcpayserver/go.sh          |  1 +
 deployment/{ => www}/stub_nginxconf.sh |  0
 4 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100755 archive/umbrel/go.sh
 rename deployment/{ => www}/stub_nginxconf.sh (100%)

diff --git a/archive/umbrel/go.sh b/archive/umbrel/go.sh
deleted file mode 100755
index e3e375d..0000000
--- a/archive/umbrel/go.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-ssh "$FQDN" "
-  set -x
-
-  cd /home/ubuntu
-
-  # first, lets make sure we have the latest code. We use git over HTTPS and store it in ~/umbrel
-  # ~/umbrel is the only folder we need to backup
-  if [ ! -d ./umbrel ]; then
-      git clone https://github.com/getumbrel/umbrel.git ./umbrel
-  else
-    
-      if [ -f ./umbrel/scripts/stop ]; then
-          sudo ./umbrel/scripts/stop 
-      fi
-  fi
-"
-
-# # DO SOME BACKUP OPERATION
-
-# ssh "$FQDN" "
-#   set -x
-
-#   mkdir -p /home/ubuntu/backup
-
-#   sudo PASSPHRASE=${DUPLICITY_BACKUP_PASSPHRASE} duplicity --exclude ${REMOTE_HOME}/umbrel/bitcoin/blocks ${REMOTE_HOME}/umbrel file://${REMOTE_BACKUP_PATH}
-#   sudo chown -R ubuntu:ubuntu ${REMOTE_BACKUP_PATH}
-# "
-
-# Start services back up.
-ssh "$FQDN" "
-  set -e
-  cd /home/ubuntu/umbrel
-
-  git config pull.rebase true
-  git fetch --all --tags
-  git checkout master
-  git pull
-  git checkout tags/v0.4.18
-
-  # To use Umbrel on mainnet, run:
-  sudo NETWORK=$BTC_CHAIN /home/ubuntu/umbrel/scripts/start
-"
-
-# we wait for lightning to comone line too.
-wait-for-it -t -60 "$FQDN:80"
-
-xdg-open "http://$FQDN" > /dev/null 2>&1
diff --git a/cluster.sh b/cluster.sh
index b998b68..cc55a09 100755
--- a/cluster.sh
+++ b/cluster.sh
@@ -188,7 +188,7 @@ fi
     fi
 
     # stub out the lxd init file for the remote SSH endpoint.
-    CLUSTER_MASTER_LXD_INIT="$CLUSTER_PATH/$CLUSTER_NAME-primary.yml"
+    CLUSTER_MASTER_LXD_INIT="$CLUSTER_PATH/$CLUSTER_NAME-lxd_profile.yml"
     cat >"$CLUSTER_MASTER_LXD_INIT" <<EOF
 config:
   core.https_address: ${MGMT_PLANE_IP}:8443
diff --git a/deployment/btcpayserver/go.sh b/deployment/btcpayserver/go.sh
index ad9aad8..d5cb918 100755
--- a/deployment/btcpayserver/go.sh
+++ b/deployment/btcpayserver/go.sh
@@ -52,6 +52,7 @@ if [ "$RUN_SERVICES" = true ]; 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
diff --git a/deployment/stub_nginxconf.sh b/deployment/www/stub_nginxconf.sh
similarity index 100%
rename from deployment/stub_nginxconf.sh
rename to deployment/www/stub_nginxconf.sh