diff --git a/deployment/umbrel/go.sh b/archive/umbrel/go.sh similarity index 96% rename from deployment/umbrel/go.sh rename to archive/umbrel/go.sh index 62e2fa8..e3e375d 100755 --- a/deployment/umbrel/go.sh +++ b/archive/umbrel/go.sh @@ -48,4 +48,4 @@ ssh "$FQDN" " # we wait for lightning to comone line too. wait-for-it -t -60 "$FQDN:80" -xdg-open "http://$FQDN" +xdg-open "http://$FQDN" > /dev/null 2>&1 diff --git a/defaults.sh b/defaults.sh index b374adc..3e48a00 100755 --- a/defaults.sh +++ b/defaults.sh @@ -4,7 +4,6 @@ set -eu export DEPLOY_WWW_SERVER=false export DEPLOY_BTCPPAY_SERVER=false -export DEPLOY_UMBREL_VPS=false export DEPLOY_GHOST=true export DEPLOY_NOSTR=false @@ -14,7 +13,6 @@ export DEPLOY_GITEA=false export WWW_HOSTNAME="www" export BTCPAY_HOSTNAME="btcpay" -export UMBREL_HOSTNAME="umbrel" export NEXTCLOUD_HOSTNAME="nextcloud" export GITEA_HOSTNAME="git" export NOSTR_HOSTNAME="relay" @@ -120,7 +118,6 @@ export GITEA_DB_IMAGE="$DEFAULT_DB_IMAGE" export SOVEREIGN_STACK_MAC_ADDRESS="aa:bb:cc:00:00:03" export WWW_MAC_ADDRESS="aa:bb:cc:00:00:00" export BTCPAY_MAC_ADDRESS="aa:bb:cc:00:00:01" -export UMBREL_MAC_ADDRESS="aa:bb:cc:00:00:02" export CLUSTERS_DIR="$HOME/ss-clusters" export SITES_PATH="$HOME/ss-sites" diff --git a/deploy.sh b/deploy.sh index 5654804..f88e577 100755 --- a/deploy.sh +++ b/deploy.sh @@ -275,19 +275,6 @@ function run_domain { MAC_ADDRESS_TO_PROVISION="$BTCPAY_MAC_ADDRESS" if [ "$BTC_CHAIN" = mainnet ]; then ROOT_DISK_SIZE_GB=150 - elif [ "$BTC_CHAIN" = testnet ]; then - ROOT_DISK_SIZE_GB=40 - fi - elif [ "$VIRTUAL_MACHINE" = umbrel ]; then - if [ "$DEPLOY_UMBREL_VPS" = false ]; then - continue - fi - - DDNS_HOST="$UMBREL_HOSTNAME" - VPS_HOSTNAME="$UMBREL_HOSTNAME" - MAC_ADDRESS_TO_PROVISION="$UMBREL_MAC_ADDRESS" - if [ "$BTC_CHAIN" = mainnet ]; then - ROOT_DISK_SIZE_GB=1000 elif [ "$BTC_CHAIN" = testnet ]; then ROOT_DISK_SIZE_GB=70 fi @@ -376,11 +363,6 @@ function run_domain { exit 1 fi - if [ -z "$DEPLOY_UMBREL_VPS" ]; then - echo "ERROR: Ensure DEPLOY_UMBREL_VPS is configured in your site_definition." - exit 1 - fi - if [ -z "$NOSTR_ACCOUNT_PUBKEY" ]; then echo "ERROR: You MUST specify a Nostr public key. This is how you get all your social features." echo "INFO: Go to your site_definition file and set the NOSTR_ACCOUNT_PUBKEY variable." @@ -508,9 +490,6 @@ export GITEA_MYSQL_ROOT_PASSWORD="$(new_pass)" ## BTCPAY SERVER; if true, then a BTCPay server is deployed. export DEPLOY_BTCPAY_SERVER=false -## Deploy and Umbrel node? -export DEPLOY_UMBREL_VPS=false - # CHAIN to DEPLOY; valid are 'regtest', 'testnet', and 'mainnet' export BTC_CHAIN=regtest diff --git a/deployment/domain_init.sh b/deployment/domain_init.sh index f1781f9..ab4eadd 100755 --- a/deployment/domain_init.sh +++ b/deployment/domain_init.sh @@ -61,7 +61,7 @@ elif [ "$VPS_HOSTING_TARGET" = lxd ]; 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_MAC_ADDRESS, BTCPAY_MAC_ADDRESS, UMBREL_MAC_ADDRESS, in your site defintion." + echo "ERROR: You MUST define a MAC Address for all your machines by setting WWW_MAC_ADDRESS, BTCPAY_MAC_ADDRESS in your site defintion." echo "INFO: IMPORTANT! You MUST have DHCP Reservations for these MAC addresses. You also need static DNS entries." exit 1 fi diff --git a/deployment/www/generate_certs.sh b/deployment/www/generate_certs.sh index c696eea..ef8488b 100755 --- a/deployment/www/generate_certs.sh +++ b/deployment/www/generate_certs.sh @@ -5,7 +5,7 @@ set -ex # let's do a refresh of the certificates. Let's Encrypt will not run if it's not time. docker pull certbot/certbot:latest -# when deploying to AWS, www exists on a separate IP address from btcpay, umbrel, etc. +# when deploying to AWS, www exists on a separate IP address from btcpay, etc. # thus, we structure the certificate accordingly. if [ "$VPS_HOSTING_TARGET" = aws ]; then docker run -it --rm \ diff --git a/reset.sh b/reset.sh index 4eafe62..b6f4a5c 100755 --- a/reset.sh +++ b/reset.sh @@ -12,7 +12,6 @@ lxc delete --force btcpay-"$LXD_VM_NAME" lxc delete --force sovereign-stack lxc profile delete www-"$LXD_VM_NAME" -lxc profile delete umbrel-"$LXD_VM_NAME" lxc profile delete btcpay-"$LXD_VM_NAME" lxc profile delete sovereign-stack