From 08235de7983b55e1dce036c8b7e0a0e3dbd79038 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Sat, 12 Aug 2023 12:25:23 -0400 Subject: [PATCH] Nitpicks. --- deployment/deploy_vm.sh | 2 +- deployment/help.txt | 3 +-- manage.sh | 2 +- management/bash_aliases | 2 ++ management/provision.sh | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/deployment/deploy_vm.sh b/deployment/deploy_vm.sh index da249a8..9afdbdc 100755 --- a/deployment/deploy_vm.sh +++ b/deployment/deploy_vm.sh @@ -25,7 +25,7 @@ if ! lxc list --format csv | grep -q "$LXD_VM_NAME"; then # create a base image if needed and instantiate a VM. if [ -z "$MAC_ADDRESS_TO_PROVISION" ]; then - echo "ERROR: You MUST define a MAC Address for all your machines by setting WWW_SERVER_MAC_ADDRESS, BTCPAYSERVER_MAC_ADDRESS in your site definition." + echo "ERROR: You MUST define a MAC Address for all your machines in your project definition." echo "INFO: IMPORTANT! You MUST have DHCP Reservations for these MAC addresses. You also need records established the DNS." exit 1 fi diff --git a/deployment/help.txt b/deployment/help.txt index 7f40e29..292aec3 100644 --- a/deployment/help.txt +++ b/deployment/help.txt @@ -6,11 +6,10 @@ You are in the Sovereign Stack Management Environment (SSME). From here, you can 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. + unless you provide the --purge 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: - https://www.sovereign-stack.org/tag/deployment-management/ - diff --git a/manage.sh b/manage.sh index 4dd5e7c..bf03540 100755 --- a/manage.sh +++ b/manage.sh @@ -2,7 +2,7 @@ # https://www.sovereign-stack.org/ss-manage/ -set -exu +set -eu cd "$(dirname "$0")" # check to ensure dependencies are met. diff --git a/management/bash_aliases b/management/bash_aliases index b7b3803..b124aa6 100644 --- a/management/bash_aliases +++ b/management/bash_aliases @@ -6,6 +6,8 @@ alias ss-show='/home/ubuntu/sovereign-stack/deployment/show.sh $@' alias ss-reset='/home/ubuntu/sovereign-stack/deployment/reset.sh $@' alias ss-update='/home/ubuntu/sovereign-stack/deployment/update.sh $@' alias ss-down='/home/ubuntu/sovereign-stack/deployment/down.sh $@' +alias ss-stop='/home/ubuntu/sovereign-stack/deployment/stop.sh $@' +alias ss-start='/home/ubuntu/sovereign-stack/deployment/start.sh $@' alias ss-help='cat /home/ubuntu/sovereign-stack/deployment/help.txt' alias ll='ls -lah' diff --git a/management/provision.sh b/management/provision.sh index 20c7c45..b167a9b 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 +sudo apt-get install -y ca-certificates curl gnupg lsb-release jq bc sudo mkdir -m 0755 -p /etc/apt/keyrings