distorted.lisp, escorted.lisp, odin.lisp: Add DKIM infrastructure.

diff --git a/distorted.lisp b/distorted.lisp
index 146f137205662af9f577b5bb6fdcc29690306561..604e93d8d4dadcf7376194e561b65ca4b4c3ca8e 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -84,10 +84,8 @@ (defzone distorted.org.uk
   ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
   ((bugs) :ttl 300 :mx lists :srv ((:smtp bugs)))
   ((lists) :ttl 300 :mx lists :srv ((:smtp lists)))
   ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
   ((bugs) :ttl 300 :mx lists :srv ((:smtp bugs)))
   ((lists) :ttl 300 :mx lists :srv ((:smtp lists)))

-
-  (stratocaster.20140403._domainkey
-   :dkim ("stratocaster-20140403"
-         :v "DKIM1" :k "rsa" :h "sha256" :s "email"))
+  ((_domainkey _domainkey.mail) :dname stratocaster.dkim)
+  ((_domainkey.bugs _domainkey.lists) :dname telecaster.dkim)

 
   ;; Anycast services.
   (dns0 :anycast ((any dns0.any) (dmz radius.dmz)
 
   ;; Anycast services.
   (dns0 :anycast ((any dns0.any) (dmz radius.dmz)


@@ -339,6 +337,32 @@ (defzone distorted.org.uk
               (40945 :rsasha256 :sha256
                #.(concatenate 'string "fb171d206d4d64c5a7a6c290ce6e20df"
                                       "44f1db7f41e2260f1fe8d7c55d524c11"))))
               (40945 :rsasha256 :sha256
                #.(concatenate 'string "fb171d206d4d64c5a7a6c290ce6e20df"
                                       "44f1db7f41e2260f1fe8d7c55d524c11"))))

+  (stratocaster.dkim
+   :ns ((radius.ns.stratocaster.dkim :ip radius.dmz)
+       (precision.ns.stratocaster.dkim :ip precision.dmz)
+       (telecaster.ns.stratocaster.dkim :ip telecaster.dmz)
+       (national.ns.stratocaster.dkim :ip national.linode)
+       #+later (mythic-beasts-1.ns.stratocaster.dkim :ip mythic-ns1)
+       #+later (mythic-beasts-2.ns.stratocaster.dkim :ip mythic-ns2)
+       #+later (mythic-beasts-3.ns.stratocaster.dkim :ip mythic-ns3))
+   :ds ((24577 :rsasha256 :sha1
+        "d06847c01e19098509a8d07a9aafaceff532c9c7")
+       (24577 :rsasha256 :sha256
+        #.(concatenate 'string "a40cdb1c633041cfbc1b80a400cff527"
+                               "2cad051915fc0cd40296a2d4590b9d2b"))))
+  (telecaster.dkim
+   :ns ((radius.ns.telecaster.dkim :ip radius.dmz)
+       (precision.ns.telecaster.dkim :ip precision.dmz)
+       (telecaster.ns.telecaster.dkim :ip telecaster.dmz)
+       (national.ns.telecaster.dkim :ip national.linode)
+       #+later (mythic-beasts-1.ns.telecaster.dkim :ip mythic-ns1)
+       #+later (mythic-beasts-2.ns.telecaster.dkim :ip mythic-ns2)
+       #+later (mythic-beasts-3.ns.telecaster.dkim :ip mythic-ns3))
+   :ds ((38896 :rsasha256 :sha1
+        "2c2daea658784e22c46bf9e86da67def1e34cf40")
+       (38896 :rsasha256 :sha256
+        #.(concatenate 'string "66997571c7d47f912caa65f2154ecd37"
+                               "5b9d391e3ed44d79ac35eef59264e521"))))

   (io :ns ((ns.io :ip jazz.dmz)))
   (play :ns (radius.ns precision.ns telecaster.ns national.ns)))
 
   (io :ns ((ns.io :ip jazz.dmz)))
   (play :ns (radius.ns precision.ns telecaster.ns national.ns)))
 


@@ -371,6 +395,25 @@ (defzone (dyn.distorted.org.uk :source telecaster.distorted.org.uk.)
 (defzone nicko.org
   (richmond :addr richmond.dmz))
 
 (defzone nicko.org
   (richmond :addr richmond.dmz))
 

+#+view/outside
+(defzone stratocaster.dkim.distorted.org.uk
+  :ns ((radius.ns :ip radius.dmz)
+       (precision.ns :ip precision.dmz)
+       (telecaster.ns :ip telecaster.dmz)
+       (national.ns :ip national.linode)
+       #+later (mythic-beasts-1.ns :ip mythic-ns1)
+       #+later (mythic-beasts-2.ns :ip mythic-ns2)
+       #+later (mythic-beasts-3.ns :ip mythic-ns3)))
+#+view/outside
+(defzone telecaster.dkim.distorted.org.uk
+  :ns ((radius.ns :ip radius.dmz)
+       (precision.ns :ip precision.dmz)
+       (telecaster.ns :ip telecaster.dmz)
+       (national.ns :ip national.linode)
+       #+later (mythic-beasts-1.ns :ip mythic-ns1)
+       #+later (mythic-beasts-2.ns :ip mythic-ns2)
+       #+later (mythic-beasts-3.ns :ip mythic-ns3)))
+

 (defrevzone trusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.

diff --git a/escorted.lisp b/escorted.lisp
index e2f542d962e8de9a611cf638d11c445a7f7b7ce5..7ee96e89e7b990e7fc394cf22889ca47262e1d58 100644 (file)
--- a/escorted.lisp
+++ b/escorted.lisp
@@ -27,7 +27,4 @@ (defzone escorted.org.uk
   ;; Mail servers
   :mx ((mail :ip stratocaster))
   :srv ((:smtp mail))
   ;; Mail servers
   :mx ((mail :ip stratocaster))
   :srv ((:smtp mail))

-
-  (stratocaster.20140403._domainkey
-   :dkim ("stratocaster-20140403"
-         :v "DKIM1" :k "rsa" :h "sha256" :s "email")))
+  (_domainkey :dname stratocaster.dkim.distorted.org.uk.))

diff --git a/odin.lisp b/odin.lisp
index f17fc24b98702361cdb04d59b6bb35e791433f21..73abae100c96e15e4db19f9476276c12073b5934 100644 (file)
--- a/odin.lisp
+++ b/odin.lisp
@@ -26,7 +26,4 @@ (defzone odin.gg
   ;; Mail servers
   :mx ((mail :ip stratocaster))
   :srv ((:smtp mail))
   ;; Mail servers
   :mx ((mail :ip stratocaster))
   :srv ((:smtp mail))

-
-  (stratocaster.20140403._domainkey
-   :dkim ("stratocaster-20140403"
-         :v "DKIM1" :k "rsa" :h "sha256" :s "email")))
+  (_domainkey :dname stratocaster.dkim.distorted.org.uk.))