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 --- manifests/00global.pp | 7 +++--- manifests/mail2.pp | 13 ----------- modules/mail2/files/mirrorlist | 5 ----- modules/mail2/manifests/backups.pp | 6 ----- modules/mail2/manifests/monitoring.pp | 3 --- modules/mail2/manifests/operatingsystem.pp | 5 ----- modules/mail2/manifests/persistent.pp | 27 ----------------------- modules/partofme/files/borg_authorized_keys | 1 - 12 files changed, 4 insertions(+), 108 deletions(-) delete mode 100755 bin/helpers/launch-mail2 delete mode 100644 manifests/mail2.pp delete mode 100644 modules/mail2/files/mirrorlist delete mode 100644 modules/mail2/manifests/backups.pp delete mode 100644 modules/mail2/manifests/monitoring.pp delete mode 100644 modules/mail2/manifests/operatingsystem.pp delete mode 100644 modules/mail2/manifests/persistent.pp 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" ;; diff --git a/manifests/00global.pp b/manifests/00global.pp index 608a37a..078bdef 100644 --- a/manifests/00global.pp +++ b/manifests/00global.pp @@ -2,10 +2,9 @@ $default_user = 'doy' $vpn_ips = { 'hornet' => '10.49.0.2', 'mail' => '10.49.0.3', - 'mail2' => '10.49.0.4', - 'partofme' => '10.49.0.5', - 'phone' => '10.49.0.6', - 'tozt' => '10.49.0.7', + 'partofme' => '10.49.0.4', + 'phone' => '10.49.0.5', + 'tozt' => '10.49.0.6', } Package::Makepkg { diff --git a/manifests/mail2.pp b/manifests/mail2.pp deleted file mode 100644 index a4e1129..0000000 --- a/manifests/mail2.pp +++ /dev/null @@ -1,13 +0,0 @@ -node 'mail2', 'mail2.localdomain' { - $persistent_data = '/media/persistent' - include mail2::persistent - Class['mail2::persistent'] -> Class['base'] - - include base - - include mail2::operatingsystem - Class['mail2::operatingsystem'] -> Package<| provider == "pacman" |> - - include mail2::backups - include mail2::monitoring -} diff --git a/modules/mail2/files/mirrorlist b/modules/mail2/files/mirrorlist deleted file mode 100644 index d1c515d..0000000 --- a/modules/mail2/files/mirrorlist +++ /dev/null @@ -1,5 +0,0 @@ -Server = https://arch.mirror.constant.com/$repo/os/$arch -Server = https://mirrors.sorengard.com/archlinux/$repo/os/$arch -Server = https://mirror.stephen304.com/archlinux/$repo/os/$arch -Server = https://mirror.wdc1.us.leaseweb.net/archlinux/$repo/os/$arch -Server = https://mirrors.rit.edu/archlinux/$repo/os/$arch diff --git a/modules/mail2/manifests/backups.pp b/modules/mail2/manifests/backups.pp deleted file mode 100644 index 8c60ed9..0000000 --- a/modules/mail2/manifests/backups.pp +++ /dev/null @@ -1,6 +0,0 @@ -class mail2::backups { - class { 'borgmatic': - extra_paths => ['/media/persistent'], - require => Service["wg-quick@algo"]; - } -} diff --git a/modules/mail2/manifests/monitoring.pp b/modules/mail2/manifests/monitoring.pp deleted file mode 100644 index c7c9a32..0000000 --- a/modules/mail2/manifests/monitoring.pp +++ /dev/null @@ -1,3 +0,0 @@ -class mail2::monitoring { - include tick::client::base_plugins -} diff --git a/modules/mail2/manifests/operatingsystem.pp b/modules/mail2/manifests/operatingsystem.pp deleted file mode 100644 index 3dad94f..0000000 --- a/modules/mail2/manifests/operatingsystem.pp +++ /dev/null @@ -1,5 +0,0 @@ -class mail2::operatingsystem { - file { '/etc/pacman.d/mirrorlist': - source => 'puppet:///modules/mail2/mirrorlist'; - } -} diff --git a/modules/mail2/manifests/persistent.pp b/modules/mail2/manifests/persistent.pp deleted file mode 100644 index 6f5f3e7..0000000 --- a/modules/mail2/manifests/persistent.pp +++ /dev/null @@ -1,27 +0,0 @@ -class mail2::persistent { - file { - "/media": - ensure => directory; - "/media/persistent": - ensure => directory, - require => File["/media"]; - } - - $fstab_line = "/dev/disk/by-id/scsi-0DO_Volume_mail2-persistent /media/persistent ext4 rw,relatime 0 2" - exec { "populate fstab": - provider => shell, - command => "echo '${fstab_line}' >> /etc/fstab", - unless => "/usr/bin/grep -qF '${fstab_line}' /etc/fstab", - require => File["/media/persistent"]; - } - - exec { "mount /media/persistent": - provider => shell, - command => "/usr/bin/mount /media/persistent", - unless => "grep ' /media/persistent ' /proc/mounts", - require => [ - File["/media/persistent"], - Exec["populate fstab"], - ]; - } -} diff --git a/modules/partofme/files/borg_authorized_keys b/modules/partofme/files/borg_authorized_keys index acae883..6ff24f4 100644 --- a/modules/partofme/files/borg_authorized_keys +++ b/modules/partofme/files/borg_authorized_keys @@ -2,4 +2,3 @@ command="borg serve --restrict-to-path /media/persistent/borg",restrict ssh-rsa command="borg serve --restrict-to-repository /media/persistent/borg/partofme",restrict ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFdFY+FnS5VNVkFISytoVpEuN89AM626cyu68fYlbqpLuCy0TGxb4aSR0F5YfJXw0yHid/kDhyTsgJoiDvnJybteWAQHM1Rg2bfVI8juKzyRUin3j4NDRrQSPLAK0QM7zPNSg3bymW53Pk0EpmOyCA/aGIWJVSqUkeKDPSa8V/WaRQRywGn+ImwsoWrFiOTgc+kUBixOXkZ2xGxXro+U/KSE2TicB+d66R33AIkTO15snOzTnPsvmDxp3u4vmsmeSotDLxmMs0OCwhAOb7i+aSPpJbFD5LpccJd1jRuW/riqadoZdhShnjA8Ieky7eANB+S6bJniKDUmFRfQSvhdHdIJTsoeVdKXXRTq7PQbVNGXNlayzVE+ro4Ckc5GKLEab2QSvRzYxevw3ZGTjUd616qDuMDO6qYyRHZEXcA6ar1n1BrreKqjRan+V5w0fW0RrUq3JVoombyrf6VZRYhjpQ8qnXtek6frFTTxmeE0tbQwcGo9a4objtHUO76LwvgBM= root@partofme command="borg serve --restrict-to-repository /media/persistent/borg/tozt",restrict ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCqRzgUQiNXrdqXSD4dq7YqX2LJ+QkOmxe40bbJblBWOY8PkG6sLbmnQKfHRv/U9sEBpSgzNKvPiyCDEhvH6iSzc9kgYZ+b4DqTBehGmutoaT8QjqRgydN9cxjmAbC2yepXKKo06ghw+mmNjWByWi01HxRGQByhFU2ilhTyXgrmdcpXXAhjqotd7c+jLpETUEXmJhn0r9M77DBLcJfkBuW+TH66KrAVFBxMFP2N4MnxNSBySfEdkdWQ9//prgiTWMhNrUpaO8BR4ij4juNjkvRiX8N1uWJuBjxuuIZ8bqwpOAp7vNRhB/JDAOCfmzL+LAUPHkZgaLlKmQJ6ljh4wp/x9QtwzudILH+/P2rmDXfjg9KGzXbxltqB8MxNeopfZ04S2OaFTy/P8gKCsF+hQQyacSYXHgYMzBp9miKCpixvhYGQMMwachD24109rUrmXErVMNPfVFY3V6n9mIFrm69yamKYZx3fDSPYMELxv9lxEqm7IrIvR4MVC73xxQ62OHk= root@tozt command="borg serve --restrict-to-repository /media/persistent/borg/mail",restrict ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDfxvzsqNPgIanDCwythZlaj2CekrqpYzAor1HGoxlhO0nJwsV84vt/rFCIxU/ZsfhsUCu8LApie4QhdNqIbY4mYRgQiNT6KdBcHJO1dfDNBYpbYRjCJ8cRBZFH91VD+rv69CRfGkQSlnVJqLrvFUmViAOUmPA691eI6FVSexAqBn89cXAVS37loGI7frdiHDa3S6dWt5rqGSzcuFs/WbvXkEzmhucvIo0phsW3aiHE+SEKn9dFLqp5oA52ciFInm2vMbL/MOXE6sJrQ3G6aL59zevO6c8GPqeU241rkbzlOSKz1vOtTiYmuWQakHOQKrr0xfR6EAAtiDxpWxPqjBk55+zog/iK1fuoH/uC2n1Yx002eJiaobuLgIKPX+pesfiYZo3bNi8rkbIo64Z/fT96N6/ooRiWBarrT13Wp0RT6iyUYrtNUgrqYDFXwCnbzGmWOtpongXubiVZciZ5ec+T9uPZu8/TKVyOqw2NY0TX19FUzlNoFXQpwYQtKzqrszE= root@mail -command="borg serve --restrict-to-repository /media/persistent/borg/mail2",restrict ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxfw8lZfhUiZ/78Z69y8AnlmHkDoRNfd9L52bey5JjNtS1c45+c1FxNJiJ3x1QPxb63VbRAM4CsBlqxpSEQ2Ne3UlQzTXjaDfQXjete3K7XbGJVUjTLlNcwCsO8/gPhmnjzgxPzWbElXjn/dHre7+PTIQkp3Ez/0sKmg/MHRcdfZ2Lc1kLses5mLGzu0cRkiMXyI+D5+1IEccoBOU9ihuCRGV3AmneUCT7aZMawdX+tKUMIyym6PBtA/LqNEBh8FMD71PqU7+3roVGC7C9m82wWob6eSKd82laQ0mWTQ/uAyWKfJ/qTeqcTO3z4CA5ALO4l4TV8rsyqLutUgwFnCW8iReGnRzquz0PwVLe9Czk9nlHA6AZaL+59Rl30cGSlGUHqzViM54W8Z7EOaNf5Vr6iNAqjkPuOYcihu1H36vTLqgXkeEafoNAIpnOaIuki66x+lnoyd5POsEL4nNKcJV3A23dmLEy3Dk3luO7MoRhey+VH6/xCd43BpHqZvLfVu8= root@mail2 -- cgit v1.2.3-54-g00ecf