From 622741ce06d55bb094f093162fcb29064459df02 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Sun, 2 Apr 2023 09:42:55 -0400 Subject: [PATCH] Add/update variable names. --- defaults.sh | 9 ++++----- deployment/remote.sh | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/defaults.sh b/defaults.sh index 44b45f6..712778e 100755 --- a/defaults.sh +++ b/defaults.sh @@ -76,8 +76,8 @@ export BTCPAYSERVER_MAC_ADDRESS= export SS_ROOT_PATH="$HOME/.ss" -export REMOTES_DIR="$SS_ROOT_PATH/remotes" -export PROJECTS_DIR="$SS_ROOT_PATH/projects" +export REMOTES_PATH="$SS_ROOT_PATH/remotes" +export PROJECTS_PATH="$SS_ROOT_PATH/projects" export SITES_PATH="$SS_ROOT_PATH/sites" # mount into ss-mgmt/home/ubuntu/snap/lxd/common/config @@ -96,9 +96,8 @@ export OTHER_SITES_LIST= export BTCPAY_ALT_NAMES= export BITCOIN_CHAIN=regtest export REMOTE_HOME="/home/ubuntu" - -export BTCPAY_SERVER_APPPATH="$REMOTE_HOME/btcpayserver-docker" -export REMOTE_CERT_BASE_DIR="$REMOTE_HOME/.certs" +export REMOTE_DATA_PATH="/home/ubuntu/ss-data" +export BTCPAY_SERVER_APPPATH="$REMOTE_DATA_PATH/btcpayserver-docker" # this space is for OS, docker images, etc. DOES NOT INCLUDE USER DATA. export ROOT_DISK_SIZE_GB=20 diff --git a/deployment/remote.sh b/deployment/remote.sh index 65f5b5c..c12f9da 100755 --- a/deployment/remote.sh +++ b/deployment/remote.sh @@ -21,7 +21,7 @@ fi #shellcheck disable=SC1091 source ../defaults.sh -export REMOTE_PATH="$REMOTES_DIR/$REMOTE_NAME" +export REMOTE_PATH="$REMOTES_PATH/$REMOTE_NAME" REMOTE_DEFINITION="$REMOTE_PATH/remote.conf" export REMOTE_DEFINITION="$REMOTE_DEFINITION"