From 6a0255a326a735e1eda5976f504fb190ada565a3 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Tue, 4 Apr 2023 16:25:58 -0400 Subject: [PATCH] All other changes. --- defaults.sh | 2 +- deployment/help.txt | 11 ++++++----- deployment/project_env.sh | 4 ++-- deployment/remote_env.sh | 14 +++++++------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/defaults.sh b/defaults.sh index ad00853..5af71f7 100755 --- a/defaults.sh +++ b/defaults.sh @@ -118,7 +118,7 @@ export PRIMARY_DOMAIN= # this is the git commit of the project/ sub git repo. # used in the migration script to switch into past for backup # then back to present (TARGET_PROJECT_GIT_COMMIT) for restore. -export TARGET_PROJECT_GIT_COMMIT=305c1afcbd7d471f133e9e573ea88759017c9702 +export TARGET_PROJECT_GIT_COMMIT=55de36dadca66b3e15f1180c2f3b7efb9658347e # export TESTNET_BLOCK_HASH=00000000d8277ba1ca66b40b3e3476629e6f0f97c5b8cfaeabfe402e55db223a diff --git a/deployment/help.txt b/deployment/help.txt index be536cb..7f40e29 100644 --- a/deployment/help.txt +++ b/deployment/help.txt @@ -2,12 +2,13 @@ You are in the Sovereign Stack Management Environment (SSME). From here, you can issue several commands: ss-remote - Take a remote SSH endpoint under management of Sovereign Stack. - ss-deploy - Deploys Sovereign Stack instances to your currenty remote according to your - various remote.conf, project.conf, and site.conf files. - ss-show - show the lxd resources associated with the current remote. - ss-update - brings an existing deployment up to the newest version of Sovereign Stack. - ss-down - Takes the active project down. Non-destructive of user data. ss-reset - The opposite of ss-remote; de-provisions an existing remote. + ss-up - Instantiate a deployment to your active project according to your + various remote.conf, project.conf, and site.conf files. + ss-down - Reverses ss-up. Takes the active project down. Non-destructive of user data, + unless you provide the --destroy flag. + ss-update - This is just ss-down then ss-up. + ss-show - show the lxd resources associated with the current remote. For more infomation about all these topics, consult the Sovereign Stack website starting with: diff --git a/deployment/project_env.sh b/deployment/project_env.sh index 381c4f9..8558afd 100755 --- a/deployment/project_env.sh +++ b/deployment/project_env.sh @@ -2,14 +2,14 @@ set -eu -export PROJECT_NAME="$(lxc info | grep "project:" | awk '{print $2}')" +PROJECT_NAME="$(lxc info | grep "project:" | awk '{print $2}')" +export PROJECT_NAME="$PROJECT_NAME" if [ "$PROJECT_NAME" = default ]; then echo "ERROR: You are on the default project. Use 'lxc project list' and 'lxc project switch '." exit 1 fi -PROJECT_PREFIX=$(echo "$PROJECT_NAME" | cut -d'-' -f1) BITCOIN_CHAIN=$(echo "$PROJECT_NAME" | cut -d'-' -f2) export PROJECT_PATH="$PROJECTS_PATH/$PROJECT_NAME" diff --git a/deployment/remote_env.sh b/deployment/remote_env.sh index 9608094..42e3b4c 100755 --- a/deployment/remote_env.sh +++ b/deployment/remote_env.sh @@ -56,22 +56,22 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do if [ "$BITCOIN_CHAIN" = testnet ]; then WWW_SSDATA_DISK_SIZE_GB=30 - WWW_BACKUP_DISK_SIZE_GB=80 + WWW_BACKUP_DISK_SIZE_GB=30 WWW_DOCKER_DISK_SIZE_GB=50 BTCPAYSERVER_SSDATA_DISK_SIZE_GB=30 - BTCPAYSERVER_BACKUP_DISK_SIZE_GB=5 - BTCPAYSERVER_DOCKER_DISK_SIZE_GB=50 + BTCPAYSERVER_BACKUP_DISK_SIZE_GB=30 + BTCPAYSERVER_DOCKER_DISK_SIZE_GB=100 elif [ "$BITCOIN_CHAIN" = mainnet ]; then WWW_SSDATA_DISK_SIZE_GB=40 - WWW_BACKUP_DISK_SIZE_GB=80 - WWW_DOCKER_DISK_SIZE_GB=40 + WWW_BACKUP_DISK_SIZE_GB=40 + WWW_DOCKER_DISK_SIZE_GB=1000 BTCPAYSERVER_SSDATA_DISK_SIZE_GB=30 - BTCPAYSERVER_BACKUP_DISK_SIZE_GB=10 - BTCPAYSERVER_DOCKER_DISK_SIZE_GB=300 + BTCPAYSERVER_BACKUP_DISK_SIZE_GB=30 + BTCPAYSERVER_DOCKER_DISK_SIZE_GB=500 fi