From aa4209550daaa475ad22fee854140c4178575cd0 Mon Sep 17 00:00:00 2001
Message-Id: <aa4209550daaa475ad22fee854140c4178575cd0.1717272044.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Fri, 3 May 2024 02:08:47 +0100
Subject: [PATCH] distorted.lisp, escorted.lisp, odin.lisp: Add DKIM
 infrastructure.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 distorted.lisp | 51 ++++++++++++++++++++++++++++++++++++++++++++++----
 escorted.lisp  |  5 +----
 odin.lisp      |  5 +----
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/distorted.lisp b/distorted.lisp
index 146f137..604e93d 100644
--- 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)))
-
-  (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)
@@ -339,6 +337,32 @@ (defzone distorted.org.uk
 	       (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)))
 
@@ -371,6 +395,25 @@ (defzone (dyn.distorted.org.uk :source telecaster.distorted.org.uk.)
 (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.
diff --git a/escorted.lisp b/escorted.lisp
index e2f542d..7ee96e8 100644
--- a/escorted.lisp
+++ b/escorted.lisp
@@ -27,7 +27,4 @@ (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")))
+  (_domainkey :dname stratocaster.dkim.distorted.org.uk.))
diff --git a/odin.lisp b/odin.lisp
index f17fc24..73abae1 100644
--- a/odin.lisp
+++ b/odin.lisp
@@ -26,7 +26,4 @@ (defzone odin.gg
   ;; 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.))
-- 
[mdw]