From d6b46241b2e8977a4c9a2b096e214dba4890cf99 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Sun, 13 Nov 2022 20:26:51 -0500 Subject: [PATCH] Refactoring/cleaup. --- defaults.sh | 7 +- deploy.sh | 184 +++++------------------ deployment/btcpayserver/backup_btcpay.sh | 4 + deployment/www/generate_certs.sh | 4 +- deployment/www/go.sh | 4 +- deployment/www/stop_docker_stacks.sh | 25 ++- deployment/www/stub/ghost_yml.sh | 4 +- deployment/www/stub/gitea_yml.sh | 4 +- deployment/www/stub/nextcloud_yml.sh | 4 +- deployment/www/stub/nginx_config.sh | 4 +- deployment/www/stub/nginx_yml.sh | 11 +- management/registry_mirror.yml | 54 ------- 12 files changed, 75 insertions(+), 234 deletions(-) delete mode 100644 management/registry_mirror.yml diff --git a/defaults.sh b/defaults.sh index 7de5216..719a19b 100755 --- a/defaults.sh +++ b/defaults.sh @@ -5,7 +5,7 @@ set -eu export WWW_SERVER_MAC_ADDRESS= export DEPLOY_WWW_SERVER=false export DEPLOY_BTCPAY_SERVER=false -export DEPLOY_GHOST=true +export DEPLOY_GHOST=false export DEPLOY_NOSTR_RELAY=false export DEPLOY_ONION_SITE=false export DEPLOY_NEXTCLOUD=false @@ -19,6 +19,7 @@ export GITEA_HOSTNAME="git" export NOSTR_HOSTNAME="relay" export SITE_LANGUAGE_CODES="en" +export LANGUAGE_CODE="en" export NOSTR_ACCOUNT_PUBKEY= # this is where the html is sourced from. @@ -38,8 +39,8 @@ export DUPLICITY_BACKUP_PASSPHRASE= export SSH_HOME="$HOME/.ssh" export VLAN_INTERFACE= export VM_NAME="sovereign-stack-base" -export DEV_MEMORY_MB="4096" -export DEV_CPU_COUNT="4" +export DEV_MEMORY_MB="8096" +export DEV_CPU_COUNT="6" export DOCKER_IMAGE_CACHE_FQDN="registry-1.docker.io" diff --git a/deploy.sh b/deploy.sh index d60e6d8..956701f 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,8 +1,11 @@ #!/bin/bash -set -eu +set -exu cd "$(dirname "$0")" +RESPOSITORY_PATH="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +export RESPOSITORY_PATH="$RESPOSITORY_PATH" + check_dependencies () { for cmd in "$@"; do if ! command -v "$cmd" >/dev/null 2>&1; then @@ -25,14 +28,12 @@ DOMAIN_NAME= RUN_CERT_RENEWAL=true SKIP_WWW=false RESTORE_WWW=false -BACKUP_CERTS=true -BACKUP_APPS=true -BACKUP_BTCPAY=true +BACKUP_CERTS=false +BACKUP_APPS=false +BACKUP_BTCPAY=false RESTORE_BTCPAY=false BTCPAY_RESTORE_ARCHIVE_PATH= BTCPAY_LOCAL_BACKUP_PATH= -MIGRATE_WWW=false -MIGRATE_BTCPAY=false SKIP_BTCPAY=false UPDATE_BTCPAY=false RECONFIGURE_BTCPAY_SERVER=false @@ -90,17 +91,6 @@ for i in "$@"; do BTCPAY_RESTORE_ARCHIVE_PATH="${i#*=}" shift ;; - --migrate-www) - MIGRATE_WWW=true - RUN_CERT_RENEWAL=false - shift - ;; - --migrate-btcpay) - MIGRATE_BTCPAY=true - BACKUP_BTCPAY=true - RUN_CERT_RENEWAL=false - shift - ;; --renew-certs) RUN_CERT_RENEWAL=true shift @@ -136,8 +126,6 @@ export BACKUP_CERTS="$BACKUP_CERTS" export BACKUP_APPS="$BACKUP_APPS" export RESTORE_BTCPAY="$RESTORE_BTCPAY" export BACKUP_BTCPAY="$BACKUP_BTCPAY" -export MIGRATE_WWW="$MIGRATE_WWW" -export MIGRATE_BTCPAY="$MIGRATE_BTCPAY" export RUN_CERT_RENEWAL="$RUN_CERT_RENEWAL" export CLUSTER_NAME="$CLUSTER_NAME" export CLUSTER_PATH="$CLUSTERS_DIR/$CLUSTER_NAME" @@ -167,50 +155,11 @@ fi source "$CLUSTER_DEFINITION" -###########################3 -# # This section is done to the management machine. We deploy a registry pull through cache on port 5000 -# if ! docker volume list | grep -q registry_data; then -# docker volume create registry_data -# fi - -# if the registry URL isn't defined, then we just use the upstream dockerhub. -# recommended to run a registry cache on your management machine though. -# if [ -n "$REGISTRY_URL" ]; then - -# cat > "$CLUSTER_PATH/registry.yml" <"$PROJECT_DEFINITION_PATH" <"$PROJECT_DEFINITION_PATH" <>"$NGINX_CONF_PATH" <