Remove/archive Umbrel functionality.

This commit is contained in:
Derek Smith 2022-08-03 10:50:45 -04:00
parent f6c9004dd1
commit 8dbd183be9
Signed by: farscapian
GPG Key ID: 8F1CD799CCA516CC
6 changed files with 3 additions and 28 deletions

View File

@ -48,4 +48,4 @@ ssh "$FQDN" "
# we wait for lightning to comone line too. # we wait for lightning to comone line too.
wait-for-it -t -60 "$FQDN:80" wait-for-it -t -60 "$FQDN:80"
xdg-open "http://$FQDN" xdg-open "http://$FQDN" > /dev/null 2>&1

View File

@ -4,7 +4,6 @@ set -eu
export DEPLOY_WWW_SERVER=false export DEPLOY_WWW_SERVER=false
export DEPLOY_BTCPPAY_SERVER=false export DEPLOY_BTCPPAY_SERVER=false
export DEPLOY_UMBREL_VPS=false
export DEPLOY_GHOST=true export DEPLOY_GHOST=true
export DEPLOY_NOSTR=false export DEPLOY_NOSTR=false
@ -14,7 +13,6 @@ export DEPLOY_GITEA=false
export WWW_HOSTNAME="www" export WWW_HOSTNAME="www"
export BTCPAY_HOSTNAME="btcpay" export BTCPAY_HOSTNAME="btcpay"
export UMBREL_HOSTNAME="umbrel"
export NEXTCLOUD_HOSTNAME="nextcloud" export NEXTCLOUD_HOSTNAME="nextcloud"
export GITEA_HOSTNAME="git" export GITEA_HOSTNAME="git"
export NOSTR_HOSTNAME="relay" 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 SOVEREIGN_STACK_MAC_ADDRESS="aa:bb:cc:00:00:03"
export WWW_MAC_ADDRESS="aa:bb:cc:00:00:00" export WWW_MAC_ADDRESS="aa:bb:cc:00:00:00"
export BTCPAY_MAC_ADDRESS="aa:bb:cc:00:00:01" 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 CLUSTERS_DIR="$HOME/ss-clusters"
export SITES_PATH="$HOME/ss-sites" export SITES_PATH="$HOME/ss-sites"

View File

@ -275,19 +275,6 @@ function run_domain {
MAC_ADDRESS_TO_PROVISION="$BTCPAY_MAC_ADDRESS" MAC_ADDRESS_TO_PROVISION="$BTCPAY_MAC_ADDRESS"
if [ "$BTC_CHAIN" = mainnet ]; then if [ "$BTC_CHAIN" = mainnet ]; then
ROOT_DISK_SIZE_GB=150 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 elif [ "$BTC_CHAIN" = testnet ]; then
ROOT_DISK_SIZE_GB=70 ROOT_DISK_SIZE_GB=70
fi fi
@ -376,11 +363,6 @@ function run_domain {
exit 1 exit 1
fi 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 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 "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." 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. ## BTCPAY SERVER; if true, then a BTCPay server is deployed.
export DEPLOY_BTCPAY_SERVER=false export DEPLOY_BTCPAY_SERVER=false
## Deploy and Umbrel node?
export DEPLOY_UMBREL_VPS=false
# CHAIN to DEPLOY; valid are 'regtest', 'testnet', and 'mainnet' # CHAIN to DEPLOY; valid are 'regtest', 'testnet', and 'mainnet'
export BTC_CHAIN=regtest export BTC_CHAIN=regtest

View File

@ -61,7 +61,7 @@ elif [ "$VPS_HOSTING_TARGET" = lxd ]; then
# create a base image if needed and instantiate a VM. # create a base image if needed and instantiate a VM.
if [ -z "$MAC_ADDRESS_TO_PROVISION" ]; then 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." echo "INFO: IMPORTANT! You MUST have DHCP Reservations for these MAC addresses. You also need static DNS entries."
exit 1 exit 1
fi fi

View File

@ -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. # let's do a refresh of the certificates. Let's Encrypt will not run if it's not time.
docker pull certbot/certbot:latest 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. # thus, we structure the certificate accordingly.
if [ "$VPS_HOSTING_TARGET" = aws ]; then if [ "$VPS_HOSTING_TARGET" = aws ]; then
docker run -it --rm \ docker run -it --rm \

View File

@ -12,7 +12,6 @@ lxc delete --force btcpay-"$LXD_VM_NAME"
lxc delete --force sovereign-stack lxc delete --force sovereign-stack
lxc profile delete www-"$LXD_VM_NAME" lxc profile delete www-"$LXD_VM_NAME"
lxc profile delete umbrel-"$LXD_VM_NAME"
lxc profile delete btcpay-"$LXD_VM_NAME" lxc profile delete btcpay-"$LXD_VM_NAME"
lxc profile delete sovereign-stack lxc profile delete sovereign-stack