From 42f5c597bc3a657c44a3b0324fb982d912216cda Mon Sep 17 00:00:00 2001
From: Joe Banks <joe@jb3.dev>
Date: Sat, 27 Jul 2024 12:43:33 +0100
Subject: postfix: update DNS to new postfix mailserver

---
 dns/zones/pydis.wtf.zone/mail.yaml | 40 ++++++++++++++++++++++++++++++++++++++
 dns/zones/pydis.wtf.zone/root.yaml | 28 --------------------------
 2 files changed, 40 insertions(+), 28 deletions(-)
 create mode 100644 dns/zones/pydis.wtf.zone/mail.yaml

diff --git a/dns/zones/pydis.wtf.zone/mail.yaml b/dns/zones/pydis.wtf.zone/mail.yaml
new file mode 100644
index 0000000..0bd2415
--- /dev/null
+++ b/dns/zones/pydis.wtf.zone/mail.yaml
@@ -0,0 +1,40 @@
+---
+"":
+  - octodns:
+      cloudflare:
+        auto-ttl: true
+    ttl: 300
+    type: MX
+    values:
+      - exchange: mail.pydis.wtf.
+        preference: 10
+  - octodns:
+      cloudflare:
+        auto-ttl: true
+    ttl: 300
+    type: TXT
+    values:
+      - v=spf1 include:_spf.mx.cloudflare.net mx a ~all
+
+_dmarc:
+  octodns:
+    cloudflare:
+      auto-ttl: true
+  ttl: 300
+  type: TXT
+  values:
+    - v=DMARC1\; p=none\; rua=mailto:dmarc@pydis.wtf\; ruf=mailto:dmarc@pydis.wtf\; fo=1\; aspf=s\;
+
+mail:
+  - octodns:
+      cloudflare:
+        auto-ttl: true
+    ttl: 300
+    type: A
+    value: 89.58.26.118
+  - octodns:
+      cloudflare:
+        auto-ttl: true
+    ttl: 300
+    type: AAAA
+    value: 2a03:4000:62:ce0:2496:aeff:fe97:dea4
diff --git a/dns/zones/pydis.wtf.zone/root.yaml b/dns/zones/pydis.wtf.zone/root.yaml
index 0131798..37c52e8 100644
--- a/dns/zones/pydis.wtf.zone/root.yaml
+++ b/dns/zones/pydis.wtf.zone/root.yaml
@@ -6,26 +6,6 @@
     ttl: 300
     type: A
     value: 192.0.2.0 # Reserved placeholder IPv4 address
-  - octodns:
-      cloudflare:
-        auto-ttl: true
-    ttl: 300
-    type: MX
-    values:
-      - exchange: amir.mx.cloudflare.net.
-        preference: 36
-      - exchange: isaac.mx.cloudflare.net.
-        preference: 60
-      - exchange: linda.mx.cloudflare.net.
-        preference: 85
-  - octodns:
-      cloudflare:
-        auto-ttl: true
-    ttl: 300
-    type: TXT
-    values:
-      - keybase-site-verification=mKEPFr6d5VSGgahHtzy0y7nPRmo7OWyOUQ7s9ds8OFs
-      - v=spf1 include:_spf.mx.cloudflare.net ~all
 
 20220929._domainkey:
   octodns:
@@ -35,14 +15,6 @@
   type: TXT
   value: v=DKIM1\; k=rsa\; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDadFXuHEGxF9XCb8mUbYfoCrFm01rzFvnkuxtoJt2jwBLQwkx+CD9KfCjdq5vzFzb0nRFP8L9NY0h1m58ZOdFnf9n4ejbMLvDcfVvzxK7W95HiGdt0RzaQ2AUI5QCFeCedj7z/PlOeM772kKzkUcXTATwFTOOxeSoxVyhHYmdlZwIDAQAB
 
-_dmarc:
-  octodns:
-    cloudflare:
-      auto-ttl: true
-  ttl: 300
-  type: TXT
-  value: v=DMARC1\; p=reject\; adkim=s
-
 alertmanager:
   octodns:
     cloudflare:
-- 
cgit v1.2.3