diff --git a/deployment/.gitignore b/deployment/.gitignore index e3f094e..e7f87e6 100644 --- a/deployment/.gitignore +++ b/deployment/.gitignore @@ -1 +1 @@ -project \ No newline at end of file +#project \ No newline at end of file diff --git a/deployment/stub_lxc_profile.sh b/deployment/stub_lxc_profile.sh index b76fe79..6e575b8 100755 --- a/deployment/stub_lxc_profile.sh +++ b/deployment/stub_lxc_profile.sh @@ -137,7 +137,7 @@ EOF "${REGISTRY_URL}" ], "labels": [ - "PROJECT_COMMIT=${PROJECT_GIT_COMMIT}" + "PROJECT_COMMIT=${TARGET_PROJECT_GIT_COMMIT}" ] } diff --git a/deployment/up.sh b/deployment/up.sh index 1f70db2..8b3220f 100755 --- a/deployment/up.sh +++ b/deployment/up.sh @@ -419,14 +419,10 @@ done # now let's run the www and btcpay-specific provisioning scripts. if [ "$SKIP_WWW" = false ]; then ./project/www/go.sh -else - echo "INFO: Skipping www VM." fi export DOMAIN_NAME="$PRIMARY_DOMAIN" export SITE_PATH="$SITES_PATH/$DOMAIN_NAME" -if [ "$SKIP_BTCPAY" = false ]; then +if [ "$SKIP_BTCPAY" = false ]; then ./project/btcpayserver/go.sh -else - echo "INFO: Skipping the btcpayserver VM." fi \ No newline at end of file diff --git a/deployment/update.sh b/deployment/update.sh index 11631a1..1045ccf 100755 --- a/deployment/update.sh +++ b/deployment/update.sh @@ -68,7 +68,7 @@ source ./project/domain_env.sh # now we want to switch the git HEAD of the project subdirectory to the # version of code that was last used -GIT_COMMIT_ON_REMOTE_HOST="$(ssh ubuntu@$BTCPAY_FQDN cat /home/ubuntu/.ss-githead)" +GIT_COMMIT_ON_REMOTE_HOST="$(ssh ubuntu@$WWW_FQDN docker info | grep PROJECT_COMMIT)" cd project/ echo "INFO: switch the 'project' repo to commit prior commit '$GIT_COMMIT_ON_REMOTE_HOST'" echo " This allows Sovereign Stack to can grab a backup using the version of the code" diff --git a/install.sh b/install.sh index 4d0affd..0049ac5 100755 --- a/install.sh +++ b/install.sh @@ -124,39 +124,39 @@ if ! lxc config device show ss-mgmt | grep -q ss-root; then lxc config device add ss-mgmt ss-root disk source="$SS_ROOT_PATH" path=/home/ubuntu/ss fi -# # if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. -# BITCOIN_DIR="$HOME/.bitcoin" -# REMOTE_BITCOIN_CACHE_PATH="/home/ubuntu/ss/cache/bitcoin" -# BITCOIN_TESTNET_BLOCKS_PATH="$BITCOIN_DIR/testnet3/blocks" -# if [ -d "$BITCOIN_TESTNET_BLOCKS_PATH" ]; then -# if ! lxc config device show ss-mgmt | grep -q ss-testnet-blocks; then -# lxc config device add ss-mgmt ss-testnet-blocks disk source="$BITCOIN_TESTNET_BLOCKS_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/testnet/blocks -# fi -# fi +# if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. +BITCOIN_DIR="$HOME/.bitcoin" +REMOTE_BITCOIN_CACHE_PATH="/home/ubuntu/ss/cache/bitcoin" +BITCOIN_TESTNET_BLOCKS_PATH="$BITCOIN_DIR/testnet3/blocks" +if [ -d "$BITCOIN_TESTNET_BLOCKS_PATH" ]; then + if ! lxc config device show ss-mgmt | grep -q ss-testnet-blocks; then + lxc config device add ss-mgmt ss-testnet-blocks disk source="$BITCOIN_TESTNET_BLOCKS_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/testnet/blocks + fi +fi -# # if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. -# BITCOIN_TESTNET_CHAINSTATE_PATH="$BITCOIN_DIR/testnet3/chainstate" -# if [ -d "$BITCOIN_TESTNET_CHAINSTATE_PATH" ]; then -# if ! lxc config device show ss-mgmt | grep -q ss-testnet-chainstate; then -# lxc config device add ss-mgmt ss-testnet-chainstate disk source="$BITCOIN_TESTNET_CHAINSTATE_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/testnet/chainstate -# fi -# fi +# if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. +BITCOIN_TESTNET_CHAINSTATE_PATH="$BITCOIN_DIR/testnet3/chainstate" +if [ -d "$BITCOIN_TESTNET_CHAINSTATE_PATH" ]; then + if ! lxc config device show ss-mgmt | grep -q ss-testnet-chainstate; then + lxc config device add ss-mgmt ss-testnet-chainstate disk source="$BITCOIN_TESTNET_CHAINSTATE_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/testnet/chainstate + fi +fi -# # if a ~/.bitcoin/blocks dir exists, mount it in. -# BITCOIN_MAINNET_BLOCKS_PATH="$BITCOIN_DIR/blocks" -# if [ -d "$BITCOIN_MAINNET_BLOCKS_PATH" ]; then -# if ! lxc config device show ss-mgmt | grep -q ss-mainnet-blocks; then -# lxc config device add ss-mgmt ss-mainnet-blocks disk source="$BITCOIN_MAINNET_BLOCKS_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/mainnet/blocks -# fi -# fi +# if a ~/.bitcoin/blocks dir exists, mount it in. +BITCOIN_MAINNET_BLOCKS_PATH="$BITCOIN_DIR/blocks" +if [ -d "$BITCOIN_MAINNET_BLOCKS_PATH" ]; then + if ! lxc config device show ss-mgmt | grep -q ss-mainnet-blocks; then + lxc config device add ss-mgmt ss-mainnet-blocks disk source="$BITCOIN_MAINNET_BLOCKS_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/mainnet/blocks + fi +fi -# # if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. -# BITCOIN_MAINNET_CHAINSTATE_PATH="$BITCOIN_DIR/chainstate" -# if [ -d "$BITCOIN_MAINNET_CHAINSTATE_PATH" ]; then -# if ! lxc config device show ss-mgmt | grep -q ss-mainnet-blocks; then -# lxc config device add ss-mgmt ss-mainnet-chainstate disk source="$BITCOIN_MAINNET_CHAINSTATE_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/mainnet/chainstate -# fi -# fi + # if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. +BITCOIN_MAINNET_CHAINSTATE_PATH="$BITCOIN_DIR/chainstate" +if [ -d "$BITCOIN_MAINNET_CHAINSTATE_PATH" ]; then + if ! lxc config device show ss-mgmt | grep -q ss-mainnet-blocks; then + lxc config device add ss-mgmt ss-mainnet-chainstate disk source="$BITCOIN_MAINNET_CHAINSTATE_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/mainnet/chainstate + fi +fi # mount the ssh directory in there. if [ -f "$SSH_PUBKEY_PATH" ]; then @@ -232,4 +232,4 @@ else git -c advice.detachedHead=false pull origin main git checkout "$TARGET_PROJECT_GIT_COMMIT" cd - -fi \ No newline at end of file +fi diff --git a/manage.sh b/manage.sh index bf03540..4dd5e7c 100755 --- a/manage.sh +++ b/manage.sh @@ -2,7 +2,7 @@ # https://www.sovereign-stack.org/ss-manage/ -set -eu +set -exu cd "$(dirname "$0")" # check to ensure dependencies are met. diff --git a/management/provision.sh b/management/provision.sh index e5702f1..5b2d5d3 100755 --- a/management/provision.sh +++ b/management/provision.sh @@ -5,7 +5,7 @@ cd "$(dirname "$0")" # NOTE! This script MUST be executed as root. sudo apt-get update -sudo apt-get install -y ca-certificates curl gnupg lsb-release htop +sudo apt-get install -y ca-certificates curl gnupg lsb-release sudo mkdir -m 0755 -p /etc/apt/keyrings @@ -34,6 +34,7 @@ sleep 10 # install snap if ! snap list | grep -q lxd; then + sudo snap install htop sudo snap install lxd --channel=latest/candidate sleep 6