From b1632714f85919ff6acab2bcc5ac7c0d27de32b6 Mon Sep 17 00:00:00 2001 From: Reid 'arrdem' McKenzie Date: Thu, 8 Aug 2024 23:16:57 -0600 Subject: [PATCH] Fixing the Fastmail setup --- .../src/resources/zonefiles/arrdem.com.j2 | 25 ++++++++++++------- projects/public_dns/update.sh | 2 +- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/projects/public_dns/src/resources/zonefiles/arrdem.com.j2 b/projects/public_dns/src/resources/zonefiles/arrdem.com.j2 index 30e0733..f4956d4 100644 --- a/projects/public_dns/src/resources/zonefiles/arrdem.com.j2 +++ b/projects/public_dns/src/resources/zonefiles/arrdem.com.j2 @@ -9,13 +9,20 @@ paperbrainz {{ ttl }} IN A {{ addr }} {% endfor %} # Service setup -@ 10800 IN MX 10 in1-smtp.messagingengine.com. -@ 10800 IN MX 20 in2-smtp.messagingengine.com. -mesmtp._domainkey 10800 IN TXT "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/arz66E8pNtYK+jWh57KkT+/bIp2iO9JEVb+9xqb9Z/R/l6zvFsUm5voKdhEJKsYkb35xpWJ699HbXWTENzWCLOvFxpPx8+MOh5i5gQDEg7P8vHfs5dDwj+dH5wQHcYTYPOIm5PFdkKemGwzHayFFOGhr5Xgf4PuiohtWZZSxzwIDAQAB" -_atproto 10800 IN TXT "did=did:plc:izyoicsqthvug3v65qkmaops" +mesmtp._domainkey {{ ttl }} IN TXT "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/arz66E8pNtYK+jWh57KkT+/bIp2iO9JEVb+9xqb9Z/R/l6zvFsUm5voKdhEJKsYkb35xpWJ699HbXWTENzWCLOvFxpPx8+MOh5i5gQDEg7P8vHfs5dDwj+dH5wQHcYTYPOIm5PFdkKemGwzHayFFOGhr5Xgf4PuiohtWZZSxzwIDAQAB" +_atproto {{ ttl }} IN TXT "did=did:plc:izyoicsqthvug3v65qkmaops" -email.lists 10800 IN CNAME mailgun.org. -lists 10800 IN MX 10 mxa.mailgun.org. -lists 10800 IN MX 10 mxb.mailgun.org. -lists 10800 IN TXT "v=spf1 include:mailgun.org ~all" -mx._domainkey.lists 10800 IN TXT "k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCcbCDs5bW+LWM9cWLbQTPTCNoiSe7giSFISx9LIU9LBSeE8483wQhx6FMe7jOR3+4njEpIyFtyOrz3ol2JdH+R7d/ZoeUeQekU7/paF90ZS5hvE2wyKCtVFCmBevxI73pcH0JUXZe9/VCTRGtt5Ksny4cBrhMwWQGk5UFyUfBGOQIDAQAB" +# Mailgun +email.lists {{ ttl }} IN CNAME mailgun.org. +lists {{ ttl }} IN MX 10 mxa.mailgun.org. +lists {{ ttl }} IN MX 10 mxb.mailgun.org. +lists {{ ttl }} IN TXT "v=spf1 include:mailgun.org ~all" +mx._domainkey.lists {{ ttl }} IN TXT "k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCcbCDs5bW+LWM9cWLbQTPTCNoiSe7giSFISx9LIU9LBSeE8483wQhx6FMe7jOR3+4njEpIyFtyOrz3ol2JdH+R7d/ZoeUeQekU7/paF90ZS5hvE2wyKCtVFCmBevxI73pcH0JUXZe9/VCTRGtt5Ksny4cBrhMwWQGk5UFyUfBGOQIDAQAB" + +# Fastmail +@ {{ ttl }} IN MX 10 in1-smtp.messagingengine.com. +@ {{ ttl }} IN MX 20 in2-smtp.messagingengine.com. +fm1._domainkey {{ ttl }} IN CNAME fm1.arrdem.com.dkim.fmhosted.com. +fm2._domainkey {{ ttl }} IN CNAME fm2.arrdem.com.dkim.fmhosted.com. +fm3._domainkey {{ ttl }} IN CNAME fm3.arrdem.com.dkim.fmhosted.com. +@ {{ ttl }} IN TXT "v=spf1 include:spf.messagingengine.com ?all" diff --git a/projects/public_dns/update.sh b/projects/public_dns/update.sh index ebcb836..8851e1f 100755 --- a/projects/public_dns/update.sh +++ b/projects/public_dns/update.sh @@ -2,7 +2,7 @@ cd "$(dirname $(realpath "$0"))" -op inject --in-file ./config.yml.in --out-file ./config.yml +[ ! -f ./config.yml ] && op inject --in-file ./config.yml.in --out-file ./config.yml exec bazel run //projects/public_dns:updater -- \ --config $(realpath ./config.yml) \