*.lisp: Preparation for `eggle' as public secondary nameserver.

[zones] / escorted.lisp

diff --git a/escorted.lisp b/escorted.lisp
index e2f542d962e8de9a611cf638d11c445a7f7b7ce5..e63a2819da1498593954f039b3e85f5e8aaaa6f3 100644 (file)
--- a/escorted.lisp
+++ b/escorted.lisp
@@ -13,6 +13,7 @@ (defzone escorted.org.uk
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
+       #+deploy-eggle (eggle.ns :ip eggle)
        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2)
        (mythic-beasts-3.ns :ip mythic-ns3))
@@ -27,7 +28,10 @@ (defzone escorted.org.uk
   ;; Mail servers
   :mx ((mail :ip stratocaster))
   :srv ((:smtp mail))
-
-  (stratocaster.20140403._domainkey
-   :dkim ("stratocaster-20140403"
-         :v "DKIM1" :k "rsa" :h "sha256" :s "email")))
+  :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.))