From 2f16d2de0a277ea4951c83bb5abddcfbc8f7be30 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Mon, 6 Mar 2023 14:44:36 -0500 Subject: [PATCH] Wire up project repo. --- deployment/.gitignore | 2 ++ install.sh | 15 ++++++++++++++- management/provision.sh | 12 +++++++----- 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 deployment/.gitignore diff --git a/deployment/.gitignore b/deployment/.gitignore new file mode 100644 index 0000000..e8246f5 --- /dev/null +++ b/deployment/.gitignore @@ -0,0 +1,2 @@ +# this is tracked in a distinct git repo. +project \ No newline at end of file diff --git a/install.sh b/install.sh index 892d0f5..b1cb684 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -eu +set -exu cd "$(dirname "$0")" # see https://www.sovereign-stack.org/management/ @@ -137,3 +137,16 @@ lxc restart ss-mgmt if [ "$ADDED_COMMAND" = true ]; then echo "NOTICE! You need to run 'source ~/.bashrc' before continuing. After that, type 'ss-manage' to enter your management environment." fi + + +# deploy clams wallet. +PROJECTS_SCRIPTS_REPO_URL="https://git.sovereign-stack.org/ss/project" +PROJECTS_SCRIPTS_PATH="$(pwd)/deployment/project" +if [ ! -d "$PROJECTS_SCRIPTS_PATH" ]; then + git clone "$PROJECTS_SCRIPTS_REPO_URL" "$PROJECTS_SCRIPTS_PATH" +else + cd "$PROJECTS_SCRIPTS_PATH" + git config --global pull.rebase false + git pull + cd - +fi diff --git a/management/provision.sh b/management/provision.sh index 5863d43..261ee49 100755 --- a/management/provision.sh +++ b/management/provision.sh @@ -41,20 +41,22 @@ if ! snap list | grep -q lxd; then sudo lxd init --auto fi -echo "Your management machine has been provisioned!" - # run a lxd command so we don't we a warning upon first invocation lxc list > /dev/null 2>&1 # add groups for docker and lxd -sudo addgroup docker +if ! groups ubuntu | grep -q docker; then + sudo addgroup docker + sudo usermod -aG docker ubuntu + sudo usermod -aG lxd ubuntu +fi -sudo usermod -aG docker ubuntu -sudo usermod -aG lxd ubuntu # if an SSH pubkey does not exist, we create one. if [ ! -f /home/ubuntu/.ssh/id_rsa.pub ]; then # generate a new SSH key for the base vm image. ssh-keygen -f /home/ubuntu/.ssh/id_rsa -t ecdsa -b 521 -N "" fi + +echo "Your management machine has been provisioned!" \ No newline at end of file