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

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)))
   ((@ 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)
   ((_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)
   ((_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)
 
   ;; Anycast services.
   (dns0 :anycast ((any dns0.any) (dmz radius.dmz)

diff --git a/escorted.lisp b/escorted.lisp
index 7ee96e89e7b990e7fc394cf22889ca47262e1d58..746dcb2d2906e7ef73d17f8ce7bf5ab873664ca0 100644 (file)
--- a/escorted.lisp
+++ b/escorted.lisp
@@ -27,4 +27,10 @@ (defzone escorted.org.uk
   ;; Mail servers
   :mx ((mail :ip stratocaster))
   :srv ((:smtp mail))
   ;; 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.))
   (_domainkey :dname stratocaster.dkim.distorted.org.uk.))

diff --git a/odin.lisp b/odin.lisp
index fc04fdec5b798c738878e17ad72ede9ed684c9d8..9968dd2b58bc6fa14dfbb7faf94667a58c5bfb7d 100644 (file)
--- a/odin.lisp
+++ b/odin.lisp
@@ -28,5 +28,8 @@ (defzone odin.gg
   :srv ((:smtp mail))
   :spf ((:version "spf1")
        (:pass :ip stratocaster.dmz)
   :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.))
   (_domainkey :dname stratocaster.dkim.distorted.org.uk.))