Before removing AWS functionality.

This commit is contained in:
Derek Smith 2022-10-30 22:09:44 -04:00
parent 47ff2522d3
commit e5164ebc7e
Signed by: farscapian
GPG Key ID: 8F1CD799CCA516CC
5 changed files with 48 additions and 41 deletions

View File

@ -8,7 +8,7 @@ cd "$(dirname "$0")"
# to use LXD. # to use LXD.
DATA_PLANE_MACVLAN_INTERFACE= DATA_PLANE_MACVLAN_INTERFACE=
DISK_TO_USE=loop DISK_TO_USE=
# override the cluster name. # override the cluster name.
CLUSTER_NAME="${1:-}" CLUSTER_NAME="${1:-}"
@ -82,29 +82,29 @@ if ! lxc remote list | grep -q "$CLUSTER_NAME"; then
esac esac
done done
# if [ -z "$DATA_PLANE_MACVLAN_INTERFACE" ]; then if [ -z "$DATA_PLANE_MACVLAN_INTERFACE" ]; then
# echo "INFO: It looks like you didn't provide input on the command line for the data plane macvlan interface." echo "INFO: It looks like you didn't provide input on the command line for the data plane macvlan interface."
# echo " We need to know which interface that is! Enter it here now." echo " We need to know which interface that is! Enter it here now."
# echo "" echo ""
# ssh "ubuntu@$FQDN" ip link ssh "ubuntu@$FQDN" ip link
# echo "Please enter the network interface that's dedicated to the Sovereign Stack data plane: " echo "Please enter the network interface that's dedicated to the Sovereign Stack data plane: "
# read -r DATA_PLANE_MACVLAN_INTERFACE read -r DATA_PLANE_MACVLAN_INTERFACE
# fi fi
# if [ -z "$DISK_TO_USE" ]; then if [ -z "$DISK_TO_USE" ]; then
# echo "INFO: It looks like the DISK_TO_USE has not been set. Enter it now." echo "INFO: It looks like the DISK_TO_USE has not been set. Enter it now."
# echo "" echo ""
# ssh "ubuntu@$FQDN" lsblk ssh "ubuntu@$FQDN" lsblk
# USER_DISK= 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 (default: loop): " read -r DISK_TO_USE
# read -r USER_DISK else
DISK_TO_USE=loop
# fi fi
else else
echo "ERROR: the cluster already exists! You need to go delete your lxd remote if you want to re-create your cluster." echo "ERROR: the cluster already exists! You need to go delete your lxd remote if you want to re-create your cluster."
@ -112,23 +112,15 @@ else
exit 1 exit 1
fi fi
# ensure we actually have that interface on the system. # # if the disk is loop-based, then we assume the / path exists.
echo "DATA_PLANE_MACVLAN_INTERFACE: $DATA_PLANE_MACVLAN_INTERFACE" # if [ "$DISK_TO_USE" != loop ]; then
if ! ssh "ubuntu@$FQDN" ip link | grep "$DATA_PLANE_MACVLAN_INTERFACE" | grep -q ",UP"; then # # ensure we actually have that disk/partition on the system.
echo "ERROR: We could not find your interface in our list of available interfaces. Please run this command again." # if ssh "ubuntu@$FQDN" lsblk | grep -q "$DISK_TO_USE"; then
echo "NOTE: You can always specify on the command line by adding the '--data-plane-interface=eth0', for example." # echo "ERROR: We could not the disk you specified. Please run this command again and supply a different disk."
exit 1 # echo "NOTE: You can always specify on the command line by adding the '--disk=/dev/sdd', for example."
fi # exit 1
# fi
# if the disk is loop-based, then we assume the / path exists. # fi
if [ "$DISK_TO_USE" != loop ]; then
# ensure we actually have that disk/partition on the system.
if ssh "ubuntu@$FQDN" lsblk | grep -q "$DISK_TO_USE"; then
echo "ERROR: We could not the disk you specified. Please run this command again and supply a different disk."
echo "NOTE: You can always specify on the command line by adding the '--disk=/dev/sdd', for example."
exit 1
fi
fi
# The MGMT Plane IP is the IP address that the LXD API binds to, which happens # The MGMT Plane IP is the IP address that the LXD API binds to, which happens
# to be the same as whichever SSH connection you're coming in on. # to be the same as whichever SSH connection you're coming in on.

View File

@ -54,6 +54,5 @@ elif [ "$VPS_HOSTING_TARGET" = lxd ]; then
-v "$REMOTE_HOME/letsencrypt/$DOMAIN_NAME/_logs":/var/log/letsencrypt \ -v "$REMOTE_HOME/letsencrypt/$DOMAIN_NAME/_logs":/var/log/letsencrypt \
certbot/certbot certonly -v --noninteractive --agree-tos --key-type ecdsa --standalone --expand -d "$DOMAIN_NAME" -d "$WWW_FQDN" -d "$BTCPAY_USER_FQDN" -d "$NEXTCLOUD_FQDN" -d "$GITEA_FQDN" -d "$NOSTR_FQDN" --email "$CERTIFICATE_EMAIL_ADDRESS" certbot/certbot certonly -v --noninteractive --agree-tos --key-type ecdsa --standalone --expand -d "$DOMAIN_NAME" -d "$WWW_FQDN" -d "$BTCPAY_USER_FQDN" -d "$NEXTCLOUD_FQDN" -d "$GITEA_FQDN" -d "$NOSTR_FQDN" --email "$CERTIFICATE_EMAIL_ADDRESS"
sleep 3
done done
fi fi

View File

@ -124,12 +124,13 @@ fi
# # start a browser session; point it to port 80 to ensure HTTPS redirect. # # start a browser session; point it to port 80 to ensure HTTPS redirect.
# wait-for-it -t 320 "$PRIMARY_WWW_FQDN:80" # # WWW_FQDN is in our certificate, so we resolve to that.
# wait-for-it -t 320 "$PRIMARY_WWW_FQDN:443" # wait-for-it -t 320 "$WWW_FQDN:80"
# wait-for-it -t 320 "$WWW_FQDN:443"
# # open bowser tabs. # # open bowser tabs.
# if [ "$DEPLOY_GHOST" = true ]; then # if [ "$DEPLOY_GHOST" = true ]; then
# xdg-open "http://$PRIMARY_WWW_FQDN" > /dev/null 2>&1 # xdg-open "http://$WWW_FQDN" > /dev/null 2>&1
# fi # fi
# if [ "$DEPLOY_NEXTCLOUD" = true ]; then # if [ "$DEPLOY_NEXTCLOUD" = true ]; then
@ -139,4 +140,7 @@ fi
# if [ "$DEPLOY_GITEA" = true ]; then # if [ "$DEPLOY_GITEA" = true ]; then
# xdg-open "http://$GITEA_FQDN" > /dev/null 2>&1 # xdg-open "http://$GITEA_FQDN" > /dev/null 2>&1
# fi # fi
# #fi
# if [ "$DEPLOY_BTCPAY_SERVER" = true ]; then
# xdg-open "http://$BTCPAY_USER_FQDN" > /dev/null 2>&1
# fi

View File

@ -59,7 +59,7 @@ if docker stack list --format "{{.Name}}" | grep -q reverse-proxy; then
# wait for all docker containers to stop. # wait for all docker containers to stop.
# TODO see if there's a way to check for this. # TODO see if there's a way to check for this.
sleep 7 sleep 10
fi fi
# generate the certs and grab a backup # generate the certs and grab a backup

12
migrate.sh Normal file
View File

@ -0,0 +1,12 @@
# move all migration logic into this script.
if machine exists, then
get backup.
don't restart services.
Then
delete machine.
Then re-run script with --restor option.