1
1

Nitpicks.

This commit is contained in:
Derek Smith 2024-02-09 11:28:29 -05:00
parent 0edb94cdea
commit 17e9398588
Signed by: farscapian
GPG Key ID: B443E530A14E1C90
7 changed files with 12 additions and 5 deletions

View File

@ -12,8 +12,6 @@ export SITES_PATH="$SS_ROOT_PATH/sites"
export INCUS_CONFIG_PATH="$SS_ROOT_PATH/incus"
export SS_CACHE_PATH="$SS_ROOT_PATH/cache"
export REMOTE_HOME="/home/ubuntu"
export REMOTE_DATA_PATH="$REMOTE_HOME/ss-data"
export REMOTE_DATA_PATH_LETSENCRYPT="$REMOTE_DATA_PATH/letsencrypt"

View File

@ -237,3 +237,5 @@ if ! incus storage list --format csv | grep -q ss-base; then
# done
fi
echo "INFO: completed remote.sh."

View File

@ -5,7 +5,6 @@ set -eu
CURRENT_REMOTE="$(incus remote get-default)"
DEPLOYMENT_STRING=
SS_ROOT_PATH="$HOME/ss"
REMOTES_PATH="$SS_ROOT_PATH/remotes"
PROJECTS_PATH="$SS_ROOT_PATH/projects"

View File

@ -111,6 +111,7 @@ for i in "$@"; do
esac
done
if [ "$RESTORE_BTCPAY" = true ] && [ -z "$BACKUP_BTCPAY_ARCHIVE_PATH" ]; then
echo "ERROR: Use the '--backup-archive-path=/path/to/btcpay/archive.tar.gz' option when restoring btcpay server."
exit 1
@ -153,6 +154,7 @@ source "$REMOTE_DEFINITION"
# this is our password generation mechanism. Relying on GPG for secure password generation
# TODO see if this is a secure way to do it.
function new_pass {
gpg --gen-random --armor 1 25
}
@ -441,6 +443,7 @@ EOL
INCUS_VM_NAME="${LNPLAY_SERVER_FQDN//./-}"
if ! incus image list -q --format csv | grep -q "$INCUS_VM_NAME"; then
# do all the docker image creation steps, but don't run services.
bash -c "./project/lnplay/up.sh -y --no-services"
@ -456,6 +459,8 @@ EOL
bash -c "./wait_for_ip.sh --incus-name=$INCUS_VM_NAME"
fi
# bring up lnplay services.
bash -c "./project/lnplay/up.sh -y"
fi

View File

@ -221,7 +221,6 @@ ssh-keyscan -H "$IP_V4_ADDRESS" >> "$SSH_HOME/known_hosts"
ssh "ubuntu@$IP_V4_ADDRESS" sudo chown -R ubuntu:ubuntu /home/ubuntu
if [ "$FROM_BUILT_IMAGE" = false ]; then
ssh "ubuntu@$IP_V4_ADDRESS" /home/ubuntu/sovereign-stack/management/provision.sh

View File

@ -72,3 +72,4 @@ apt-get update
# TODO see if this can be fixed by installing JUST the incus client.
# none of the systemd/daemon stuff is needed necessarily.
apt-get install incus -y

View File

@ -2,6 +2,9 @@
set -exu
# this script uninstalls incus from the MANAGEMENT MACHINE
# if you want to remove incus from remote cluster hosts, run ss-reset.
PURGE_INCUS=false
# grab any modifications from the command line.