From 686817571e988bab33c7fc3c90d75e69994c5e5a Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Tue, 24 Oct 2023 17:27:21 -0500
Subject: [PATCH] smtp-relay: Switch to Fastmail

AWS is going to begin charging extra for routable IPv4 addresses soon.
There's really no point in having a relay in the cloud anymore anyway,
since a) all outbound messages are sent via the local relay and b) no
messages are sent to anyone except me.
---
 group_vars/smtp-relay.yml                  |  2 +-
 host_vars/smtp1.pyrocufflink.blue/main.yml |  2 +-
 host_vars/smtp1.pyrocufflink.blue/vault    | 13 ++++++-------
 roles/postfix/handlers/main.yml            |  4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/group_vars/smtp-relay.yml b/group_vars/smtp-relay.yml
index 0efecd3..602794f 100644
--- a/group_vars/smtp-relay.yml
+++ b/group_vars/smtp-relay.yml
@@ -1,6 +1,6 @@
 smtp:
   mode: relay
-  host: mail.pyrocufflink.net
+  host: smtp.fastmail.com
   port: 587
   auth: plain
   username: '{{ smtp_username }}'
diff --git a/host_vars/smtp1.pyrocufflink.blue/main.yml b/host_vars/smtp1.pyrocufflink.blue/main.yml
index a03c973..4b5b739 100644
--- a/host_vars/smtp1.pyrocufflink.blue/main.yml
+++ b/host_vars/smtp1.pyrocufflink.blue/main.yml
@@ -1,4 +1,4 @@
-smtp_username: '{{ ansible_fqdn }}'
+smtp_username: admiralnemo@fastmail.com
 smtp_password: '{{ vault_smtp_password }}'
 smtp_inet_interfaces: all
 # TODO: Dynamically calculate these
diff --git a/host_vars/smtp1.pyrocufflink.blue/vault b/host_vars/smtp1.pyrocufflink.blue/vault
index eb17e97..e9dc06d 100644
--- a/host_vars/smtp1.pyrocufflink.blue/vault
+++ b/host_vars/smtp1.pyrocufflink.blue/vault
@@ -1,8 +1,7 @@
 $ANSIBLE_VAULT;1.1;AES256
-39323632366639663466613963386638626664323666616164353365376630333035383236663061
-6437376261363436633431393766333837633161623032300a366132393366396463333136663863
-66396439663734393837366461346138636530363366303562646262313931626632326531666433
-3338316133623739350a633333656366393935363834366633326239346332333664353537373664
-61353437653263666261613033663532363939396332666265656138643664363436646138343734
-32356134353034623161353533336635306162353939666437636637356235363861626430653738
-633661656535353137373233666566313238
+31636633656134376432323061363839623233323233636631333239653636613936383265393331
+6163383761623165643632366264643433326638303338310a363833336566643939333830343237
+64343965623261393462643136353330633562343636386361333434663464626434633533613434
+6635303234333462330a323037623632633366356463653739393034393863356434383430393066
+36376461366166383365643366383033333365626161366634343562366361316561333566393831
+6262396438326461666261346562376563643630653566633363
diff --git a/roles/postfix/handlers/main.yml b/roles/postfix/handlers/main.yml
index cc33a43..b91ee29 100644
--- a/roles/postfix/handlers/main.yml
+++ b/roles/postfix/handlers/main.yml
@@ -1,3 +1,5 @@
+- name: rehash postfix sasl passwd table
+  command: postmap /etc/postfix/sasl_passwd
 - name: restart postfix
   service:
     name=postfix
@@ -6,7 +8,5 @@
   service:
     name=postfix
     state=reloaded
-- name: rehash postfix sasl passwd table
-  command: postmap /etc/postfix/sasl_passwd
 - name: save firewalld configuration
   command: firewall-cmd --runtime-to-permanent