From eaa4f0abb1e56c3d4fae7f54873a8a8911e63105 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Tue, 5 Sep 2023 22:01:57 -0400 Subject: [PATCH] changes from tabconf --- deployment/deploy_vm.sh | 4 +-- deployment/deployment_defaults.sh | 12 +++---- deployment/domain_list.sh | 2 +- deployment/down.sh | 12 +++---- deployment/project | 2 +- deployment/project_env.sh | 6 ++-- deployment/remote.sh | 6 ++-- deployment/remote_env.sh | 12 +++---- deployment/stop.sh | 4 +-- deployment/stub_lxc_profile.sh | 7 ++-- deployment/up.sh | 58 +++++++++++++++---------------- deployment/wait_for_lxc_ip.sh | 4 ++- install.sh | 2 +- management/provision.sh | 2 +- 14 files changed, 67 insertions(+), 66 deletions(-) diff --git a/deployment/deploy_vm.sh b/deployment/deploy_vm.sh index 9afdbdc..17eeb7f 100755 --- a/deployment/deploy_vm.sh +++ b/deployment/deploy_vm.sh @@ -57,8 +57,8 @@ if ! lxc list --format csv | grep -q "$LXD_VM_NAME"; then DOCKER_DISK_SIZE_GB="$BTCPAYSERVER_DOCKER_DISK_SIZE_GB" fi - if [ "$VIRTUAL_MACHINE" = clamsserver ]; then - if [ "$SKIP_CLAMSSERVER" = true ]; then + if [ "$VIRTUAL_MACHINE" = lnplayserver ]; then + if [ "$SKIP_LNPLAY_SERVER" = true ]; then exit 0 fi diff --git a/deployment/deployment_defaults.sh b/deployment/deployment_defaults.sh index 791485e..def002f 100755 --- a/deployment/deployment_defaults.sh +++ b/deployment/deployment_defaults.sh @@ -32,13 +32,13 @@ export BTCPAYSERVER_SSDATA_DISK_SIZE_GB=20 export BTCPAYSERVER_BACKUP_DISK_SIZE_GB=20 export BTCPAYSERVER_DOCKER_DISK_SIZE_GB=30 -export CLAMSSERVER_SSDATA_DISK_SIZE_GB=20 -export CLAMSSERVER_BACKUP_DISK_SIZE_GB=20 -export CLAMSSERVER_DOCKER_DISK_SIZE_GB=100 +export LNPLAY_SERVER_SSDATA_DISK_SIZE_GB=20 +export LNPLAY_SERVER_BACKUP_DISK_SIZE_GB=20 +export LNPLAY_SSERVER_DOCKER_DISK_SIZE_GB=100 export WWW_HOSTNAME="www" export BTCPAY_SERVER_HOSTNAME="btcpayserver" -export CLAMS_SERVER_HOSTNAME="clamsserver" +export LNPLAY_SERVER_HOSTNAME="lnplayserver" export BTCPAY_HOSTNAME_IN_CERT="btcpay" export NEXTCLOUD_HOSTNAME="nextcloud" export GITEA_HOSTNAME="git" @@ -51,6 +51,6 @@ export BTCPAY_SERVER_CPU_COUNT="4" export BTCPAY_SERVER_MEMORY_MB="4096" export WWW_SERVER_CPU_COUNT="4" export WWW_SERVER_MEMORY_MB="4096" -export CLAMS_SERVER_CPU_COUNT="4" -export CLAMS_SERVER_MEMORY_MB="4096" +export LNPLAY_SERVER_CPU_COUNT="4" +export LNPLAY_SERVER_MEMORY_MB="4096" export DOCKER_IMAGE_CACHE_FQDN="registry-1.docker.io" diff --git a/deployment/domain_list.sh b/deployment/domain_list.sh index c572bf5..07a0833 100755 --- a/deployment/domain_list.sh +++ b/deployment/domain_list.sh @@ -13,4 +13,4 @@ export OTHER_SITES_LIST="$OTHER_SITES_LIST" export PRIMARY_WWW_FQDN="$WWW_HOSTNAME.$DOMAIN_NAME" export BTCPAY_SERVER_FQDN="$BTCPAY_SERVER_HOSTNAME.$DOMAIN_NAME" -export CLAMS_SERVER_FQDN="$CLAMS_SERVER_HOSTNAME.$DOMAIN_NAME" \ No newline at end of file +export LNPLAY_SERVER_FQDN="$LNPLAY_SERVER_HOSTNAME.$DOMAIN_NAME" \ No newline at end of file diff --git a/deployment/down.sh b/deployment/down.sh index 43377bc..363194a 100755 --- a/deployment/down.sh +++ b/deployment/down.sh @@ -14,7 +14,7 @@ KEEP_DOCKER_VOLUME=true OTHER_SITES_LIST= SKIP_BTCPAYSERVER=false SKIP_WWW=false -SKIP_CLAMSSERVER=false +SKIP_LNPLAY_SERVER=false BACKUP_WWW_APPS=true # grab any modifications from the command line. @@ -32,8 +32,8 @@ for i in "$@"; do SKIP_WWW=true shift ;; - --skip-clamsserver) - SKIP_CLAMSSERVER=true + --skip-lnplayserver) + SKIP_LNPLAY_SERVER=true shift ;; *) @@ -52,8 +52,8 @@ if [ "$SKIP_WWW" = false ]; then SERVERS="www $SERVERS" fi -if [ "$SKIP_CLAMSSERVER" = false ]; then - SERVERS="clamsserver $SERVERS" +if [ "$SKIP_LNPLAY_SERVER" = false ]; then + SERVERS="lnplayserver $SERVERS" fi . ./deployment_defaults.sh @@ -103,7 +103,7 @@ for VIRTUAL_MACHINE in $SERVERS; do VM_ID=w if [ "$VIRTUAL_MACHINE" = btcpayserver ]; then VM_ID="b" - elif [ "$VIRTUAL_MACHINE" = clamsserver ]; then + elif [ "$VIRTUAL_MACHINE" = lnplayserver ]; then VM_ID="c" fi diff --git a/deployment/project b/deployment/project index 9eceb40..7dbfb2e 160000 --- a/deployment/project +++ b/deployment/project @@ -1 +1 @@ -Subproject commit 9eceb40dba3946011723321d059614c9d9acf8fe +Subproject commit 7dbfb2e4a7d6c0fec4227520bad2d2e67f1dbec1 diff --git a/deployment/project_env.sh b/deployment/project_env.sh index b13b68c..795b615 100755 --- a/deployment/project_env.sh +++ b/deployment/project_env.sh @@ -50,6 +50,6 @@ export BTCPAYSERVER_SSDATA_DISK_SIZE_GB="$BTCPAYSERVER_SSDATA_DISK_SIZE_GB" export BTCPAYSERVER_BACKUP_DISK_SIZE_GB="$BTCPAYSERVER_BACKUP_DISK_SIZE_GB" export BTCPAYSERVER_DOCKER_DISK_SIZE_GB="$BTCPAYSERVER_DOCKER_DISK_SIZE_GB" -export CLAMSSERVER_SSDATA_DISK_SIZE_GB="$CLAMSSERVER_SSDATA_DISK_SIZE_GB" -export CLAMSSERVER_BACKUP_DISK_SIZE_GB="$CLAMSSERVER_BACKUP_DISK_SIZE_GB" -export CLAMSSERVER_DOCKER_DISK_SIZE_GB="$CLAMSSERVER_DOCKER_DISK_SIZE_GB" \ No newline at end of file +export LNPLAY_SERVER_SSDATA_DISK_SIZE_GB="$LNPLAY_SERVER_SSDATA_DISK_SIZE_GB" +export LNPLAY_SERVER_BACKUP_DISK_SIZE_GB="$LNPLAY_SERVER_BACKUP_DISK_SIZE_GB" +export LNPLAY_SSERVER_DOCKER_DISK_SIZE_GB="$LNPLAY_SSERVER_DOCKER_DISK_SIZE_GB" \ No newline at end of file diff --git a/deployment/remote.sh b/deployment/remote.sh index 626a28e..2ec0457 100755 --- a/deployment/remote.sh +++ b/deployment/remote.sh @@ -13,8 +13,8 @@ DISK_TO_USE= # override the remote name. REMOTE_NAME="${1:-}" if [ -z "$REMOTE_NAME" ]; then - echo "ERROR: The remote name was not provided. Syntax is: 'ss-remote REMOTE_NAME SSH_HOST_FQDN'" - echo " for example: 'ss-remote dev host01.domain.tld" + echo "ERROR: The remote name was not provided. Syntax is: 'ss-remote '" + echo " for example: 'ss-remote development clusterhost00.domain.tld" exit 1 fi @@ -148,7 +148,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.16/stable' + ssh -t "ubuntu@$FQDN" 'sudo snap install lxd --channel=5.17/stable' sleep 5 fi diff --git a/deployment/remote_env.sh b/deployment/remote_env.sh index 10ba202..294a630 100755 --- a/deployment/remote_env.sh +++ b/deployment/remote_env.sh @@ -65,9 +65,9 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do BTCPAYSERVER_BACKUP_DISK_SIZE_GB=30 BTCPAYSERVER_DOCKER_DISK_SIZE_GB=100 - CLAMSSERVER_SSDATA_DISK_SIZE_GB=20 - CLAMSSERVER_BACKUP_DISK_SIZE_GB=20 - CLAMSSERVER_DOCKER_DISK_SIZE_GB=20 + LNPLAY_SERVER_SSDATA_DISK_SIZE_GB=20 + LNPLAY_SERVER_BACKUP_DISK_SIZE_GB=20 + LNPLAY_SSERVER_DOCKER_DISK_SIZE_GB=20 elif [ "$BITCOIN_CHAIN" = mainnet ]; then @@ -79,9 +79,9 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do BTCPAYSERVER_BACKUP_DISK_SIZE_GB=30 BTCPAYSERVER_DOCKER_DISK_SIZE_GB=500 - CLAMSSERVER_SSDATA_DISK_SIZE_GB=20 - CLAMSSERVER_BACKUP_DISK_SIZE_GB=20 - CLAMSSERVER_DOCKER_DISK_SIZE_GB=400 + LNPLAY_SERVER_SSDATA_DISK_SIZE_GB=20 + LNPLAY_SERVER_BACKUP_DISK_SIZE_GB=20 + LNPLAY_SSERVER_DOCKER_DISK_SIZE_GB=400 fi diff --git a/deployment/stop.sh b/deployment/stop.sh index 606aba5..abc3f90 100755 --- a/deployment/stop.sh +++ b/deployment/stop.sh @@ -61,6 +61,6 @@ if [ "$SERVER_TO_STOP" = btcpayserver ]; then fi fi -if [ "$SERVER_TO_STOP" = clamsserver ]; then - DOCKER_HOST="ssh://ubuntu@$CLAMS_SERVER_FQDN" ./project/clams-server/down.sh +if [ "$SERVER_TO_STOP" = lnplayserver ]; then + DOCKER_HOST="ssh://ubuntu@$LNPLAY_SERVER_FQDN" ./project/lnplay/down.sh fi \ No newline at end of file diff --git a/deployment/stub_lxc_profile.sh b/deployment/stub_lxc_profile.sh index 91e8b5b..7a66b82 100755 --- a/deployment/stub_lxc_profile.sh +++ b/deployment/stub_lxc_profile.sh @@ -73,10 +73,10 @@ if [ "$VIRTUAL_MACHINE" = btcpayserver ]; then EOF -elif [ "$VIRTUAL_MACHINE" = clamsserver ]; then +elif [ "$VIRTUAL_MACHINE" = lnplayserver ]; then cat >> "$YAML_PATH" <./project/clams-server/active_env.txt <./project/lnplay/active_env.txt < "$CLAMS_ENV_FILE" < "$LNPLAY_ENV_FILE" <