ss/sovereign-stack
ss/sovereign-stack
1
1
Fork 1
Code Releases Activity

Update informational messages and whitespace.

Browse Source
This commit is contained in:
Derek Smith 2023-03-18 11:15:07 -04:00
parent 18fb5a1fe0
commit de6f078774
Signed by: farscapian
GPG Key ID: B443E530A14E1C90
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
defaults.sh
View File

@ -47,7 +47,7 @@ export DOCKER_IMAGE_CACHE_FQDN="registry-1.docker.io"
export NEXTCLOUD_SPACE_GB=10 export NEXTCLOUD_SPACE_GB=10
DEFAULT_DB_IMAGE="mariadb:10.9.3-jammy" DEFAULT_DB_IMAGE="mariadb:10.11.2-jammy"
# run the docker stack. # run the docker stack.
@ -100,13 +100,19 @@ export REMOTE_CERT_BASE_DIR="$REMOTE_HOME/.certs"
# this space is for OS, docker images, etc. DOES NOT INCLUDE USER DATA. # this space is for OS, docker images, etc. DOES NOT INCLUDE USER DATA.
export ROOT_DISK_SIZE_GB=20 export ROOT_DISK_SIZE_GB=20
export REGISTRY_URL="https://index.docker.io/v1/" export REGISTRY_URL="https://index.docker.io/v1"
export PRIMARY_DOMAIN= export PRIMARY_DOMAIN=
# this is the git commit of the project/ sub git repo. # this is the git commit of the project/ sub git repo.
# used in the migration script to switch into past for backup # used in the migration script to switch into past for backup
# then back to present (TARGET_PROJECT_GIT_COMMIT) for restore. # then back to present (TARGET_PROJECT_GIT_COMMIT) for restore.
export TARGET_PROJECT_GIT_COMMIT=c661ac0be91276593f718debe1266e8bab3a3c65 export TARGET_PROJECT_GIT_COMMIT=bde59ef71718fd8810762dbbbd4877a7968a8cd1
#
export TESTNET_BLOCK_HASH=00000000d8277ba1ca66b40b3e3476629e6f0f97c5b8cfaeabfe402e55db223a
export MAINNET_BLOCK_HASH=000000000000000000047941e3a6102e8896a4ae66b962599568eb25abd6b405
export SS_CACHE_PATH="$SS_ROOT_PATH/cache" export SS_CACHE_PATH="$SS_ROOT_PATH/cache"
export SS_JAMMY_PATH="$SS_CACHE_PATH/$UBUNTU_BASE_IMAGE_NAME" export SS_JAMMY_PATH="$SS_CACHE_PATH/$UBUNTU_BASE_IMAGE_NAME"

4
deployment/remote.sh
View File

@ -93,7 +93,7 @@ if ! lxc remote list | grep -q "$REMOTE_NAME"; then
ssh "ubuntu@$FQDN" lsblk --paths ssh "ubuntu@$FQDN" lsblk --paths
echo "Please enter the disk or partition that Sovereign Stack will use to store data (default: loop): " echo "Please enter the disk or partition that Sovereign Stack will use to store data: "
read -r DISK_TO_USE read -r DISK_TO_USE
fi fi
@ -221,7 +221,7 @@ if wait-for-it -t 20 "$FQDN:8443"; then
lxc remote add "$REMOTE_NAME" "$FQDN" --password="$LXD_REMOTE_PASSWORD" --protocol=lxd --auth-type=tls --accept-certificate lxc remote add "$REMOTE_NAME" "$FQDN" --password="$LXD_REMOTE_PASSWORD" --protocol=lxd --auth-type=tls --accept-certificate
lxc remote switch "$REMOTE_NAME" lxc remote switch "$REMOTE_NAME"
echo "INFO: You have create a new remote named '$REMOTE_NAME'. Great! We switched your lxd remote to it." echo "INFO: You have create a new remote named '$REMOTE_NAME'. Your lxc client is now target it."
else else
echo "ERROR: Could not detect the LXD endpoint. Something went wrong." echo "ERROR: Could not detect the LXD endpoint. Something went wrong."
exit 1 exit 1

5
deployment/reset.sh
View File

@ -43,7 +43,6 @@ if lxc network list --format csv | grep -q lxdbr1; then
lxc network delete lxdbr1 lxc network delete lxdbr1
fi fi
# create the testnet/mainnet blocks/chainstate subvolumes. # create the testnet/mainnet blocks/chainstate subvolumes.
for CHAIN in mainnet testnet; do for CHAIN in mainnet testnet; do
for DATA in blocks chainstate; do for DATA in blocks chainstate; do
@ -53,16 +52,14 @@ for CHAIN in mainnet testnet; do
done done
done done
if lxc storage list --format csv | grep -q ss-base; then if lxc storage list --format csv | grep -q ss-base; then
lxc storage delete ss-base lxc storage delete ss-base
fi fi
CURRENT_REMOTE="$(lxc remote get-default)" CURRENT_REMOTE="$(lxc remote get-default)"
if ! lxc remote get-default | grep -q "local"; then if ! lxc remote get-default | grep -q "local"; then
lxc remote switch local lxc remote switch local
lxc remote remove "$CURRENT_REMOTE" lxc remote remove "$CURRENT_REMOTE"
echo "INFO: The remote '$CURRENT_REMOTE' has been removed! You are currenly controlling your local instance." echo "INFO: The remote '$CURRENT_REMOTE' has been removed! You are now controlling your local instance."
fi fi