From 1c2511af21c76a19834a4c6711fadea591ba2563 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Wed, 15 Mar 2023 19:21:02 -0400 Subject: [PATCH] Create SS_ROOT_PATH --- defaults.sh | 8 +++++--- deployment/help.txt | 2 ++ deployment/remote.sh | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/defaults.sh b/defaults.sh index 85d4f7e..c58575f 100755 --- a/defaults.sh +++ b/defaults.sh @@ -74,9 +74,11 @@ export NOSTR_RELAY_IMAGE="scsibug/nostr-rs-relay" export WWW_SERVER_MAC_ADDRESS= export BTCPAYSERVER_MAC_ADDRESS= -export REMOTES_DIR="$HOME/ss-remotes" -export PROJECTS_DIR="$HOME/ss-projects" -export SITES_PATH="$HOME/ss-sites" +export SS_ROOT_PATH="$HOME/.ss" + +export REMOTES_DIR="$SS_ROOT_PATH/remotes" +export PROJECTS_DIR="$SS_ROOT_PATH/projects" +export SITES_PATH="$SS_ROOT_PATH/sites" # The base VM image. export LXD_UBUNTU_BASE_VERSION="jammy" diff --git a/deployment/help.txt b/deployment/help.txt index 3d5e011..46f4306 100644 --- a/deployment/help.txt +++ b/deployment/help.txt @@ -5,8 +5,10 @@ You are in the Sovereign Stack Management Environment (SSME). From here, you can ss-deploy - Creates a deployment to your active LXD remote. ss-destroy - Destroys the active deployment (WARNING: destructive). ss-update - brings an existing deployment up to the newest version of Sovereign Stack. + ss-reset - The opposite of ss-remote; deprovisions on the current remote. 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: - https://www.sovereign-stack.org/tag/instance-management/ + diff --git a/deployment/remote.sh b/deployment/remote.sh index 9c346b4..ded1876 100755 --- a/deployment/remote.sh +++ b/deployment/remote.sh @@ -163,7 +163,7 @@ fi # install dependencies. ssh -t "ubuntu@$FQDN" 'sudo apt update && sudo apt upgrade -y && sudo apt install htop dnsutils nano -y' if ! ssh "ubuntu@$FQDN" snap list | grep -q lxd; then - ssh -t "ubuntu@$FQDN" 'sudo snap install lxd --channel=5.11/stable' + ssh -t "ubuntu@$FQDN" 'sudo snap install lxd' sleep 5 fi