From 1d1e7008bf646998f2dea9b260843cd1c97524f8 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 3 Oct 2021 12:50:29 -0400 Subject: remove mail2 config for now --- bin/algo-config | 6 ------ bin/helpers/launch-mail2 | 34 ---------------------------------- bin/launch | 2 +- bin/terminate | 3 --- 4 files changed, 1 insertion(+), 44 deletions(-) delete mode 100755 bin/helpers/launch-mail2 (limited to 'bin') diff --git a/bin/algo-config b/bin/algo-config index f59a6a7..f9297ab 100755 --- a/bin/algo-config +++ b/bin/algo-config @@ -49,12 +49,6 @@ scp "$config_path"/mail-not-captive.conf root@mail.tozt.net:/etc/wireguard/algo. cp "$config_path"/mail-not-captive.conf /mnt/puppet/mail/wireguard $secrets_bin sync mail -# mail2 -fixup_configs mail2 -scp "$config_path"/mail2-not-captive.conf root@mail2.tozt.net:/etc/wireguard/algo.conf -cp "$config_path"/mail2-not-captive.conf /mnt/puppet/mail2/wireguard -$secrets_bin sync mail2 - # phone fixup_configs phone echo "algo-captive" diff --git a/bin/helpers/launch-mail2 b/bin/helpers/launch-mail2 deleted file mode 100755 index 38176d7..0000000 --- a/bin/helpers/launch-mail2 +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash -set -eu -set -o pipefail - -# shellcheck source=functions.sh -. "$(dirname "$0")/functions.sh" - -create_droplet mail2.tozt.net s-1vcpu-1gb 0812b69f-dde4-11eb-9b7e-0a58ac1465ad - -echo "Creating DNS entry for $ip..." -record_id=$( - doctl \ - -t "$(cat /mnt/digitalocean)" \ - compute domain records list \ - tozt.net \ - --format Name,Type,ID \ - --no-header | - grep '^smtp2 \+A ' | - awk '{print $3}' -) -doctl \ - -t "$(cat /mnt/digitalocean)" \ - compute domain records update \ - tozt.net \ - --record-id "$record_id" \ - --record-type A \ - --record-name smtp2 \ - --record-data "$ip" \ - --record-ttl 600 -echo "Done creating DNS entry" - -provision_droplet mail2 - -echo "Done" diff --git a/bin/launch b/bin/launch index 2ae4738..94aefb9 100755 --- a/bin/launch +++ b/bin/launch @@ -6,7 +6,7 @@ script_path="$(realpath "$(dirname "$0")")" secrets_bin="${script_path}/secrets" case "$1" in -base | tozt | algo | mail | mail2 | partofme) +base | tozt | algo | mail | partofme) "$secrets_bin" open trap '"$secrets_bin" close' EXIT "$(dirname "$0")/helpers/launch-$1" diff --git a/bin/terminate b/bin/terminate index b2e30b7..202e236 100755 --- a/bin/terminate +++ b/bin/terminate @@ -19,9 +19,6 @@ tozt | algo | mail | mail2) mail) hostname=mail.tozt.net ;; - mail2) - hostname=mail2.tozt.net - ;; esac doctl -t "$(cat /mnt/digitalocean)" compute droplet delete "$hostname" ;; -- cgit v1.2.3-54-g00ecf