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

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 141fee3533432015ea88c189a41e9f5f32e7135c..e2ffe4f3b55055d51937b4363260728c93806506 100644 (file)
--- 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)