From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 6 May 2024 03:55:56 +0000 (+0100)
Subject: distorted.lisp, escorted.lisp, odin.lisp: Take off the training wheels.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/commitdiff_plain/8ddb3b7d2afebcbbe83f345dae755706cc148ae3

distorted.lisp, escorted.lisp, odin.lisp: Take off the training wheels.
---

diff --git a/distorted.lisp b/distorted.lisp
index 141fee3..e2ffe4f 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -84,15 +84,17 @@ (defzone distorted.org.uk
   ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
   (bugs :mx lists :srv ((:smtp bugs)))
   (lists :mx lists :srv ((:smtp lists)))
-  (_dmarc :dmarc (:v "DMARC1" :p "none" :sp "none" :adkim "s" :aspf "s"))
+  (_dmarc :dmarc (:v "DMARC1"
+		  :p "quarantine" :sp "quarantine"
+		  :adkim "s" :aspf "s"))
   ((_domainkey _domainkey.mail) :dname stratocaster.dkim)
   ((stratocaster @ mail) :spf ((:version "spf1")
 			       (:pass :ip stratocaster.dmz)
-			       (:shrug :all)))
+			       (:soft :all)))
   ((_domainkey.bugs _domainkey.lists) :dname telecaster.dkim)
   ((telecaster bugs lists) :spf ((:version "spf1")
 				 (:pass :ip telecaster.dmz)
-				 (:shrug :all)))
+				 (:soft :all)))
 
   ;; Anycast services.
   (dns0 :anycast ((any dns0.any) (dmz radius.dmz)
diff --git a/escorted.lisp b/escorted.lisp
index 7ee96e8..746dcb2 100644
--- a/escorted.lisp
+++ b/escorted.lisp
@@ -27,4 +27,10 @@ (defzone escorted.org.uk
   ;; Mail servers
   :mx ((mail :ip stratocaster))
   :srv ((:smtp mail))
+  :spf ((:version "spf1")
+	(:pass :ip stratocaster.dmz)
+	(:soft :all))
+  (_dmarc :dmarc (:v "DMARC1"
+		  :p "quarantine" :sp "quarantine"
+		  :adkim "s" :aspf "s"))
   (_domainkey :dname stratocaster.dkim.distorted.org.uk.))
diff --git a/odin.lisp b/odin.lisp
index fc04fde..9968dd2 100644
--- a/odin.lisp
+++ b/odin.lisp
@@ -28,5 +28,8 @@ (defzone odin.gg
   :srv ((:smtp mail))
   :spf ((:version "spf1")
 	(:pass :ip stratocaster.dmz)
-	(:shrug :all))
+	(:soft :all))
+  (_dmarc :dmarc (:v "DMARC1"
+		  :p "quarantine" :sp "quarantine"
+		  :adkim "s" :aspf "s"))
   (_domainkey :dname stratocaster.dkim.distorted.org.uk.))