distorted.lisp: Don't advertise Lets Encrypt certs for submission or IMAP.

[zones] / binswood.lisp

diff --git a/binswood.lisp b/binswood.lisp
index 8cb184ffad0c51526d1444699aaf449672aea860..322929de3af482dd24f7b75f8a796bac58bc78db 100644 (file)
--- a/binswood.lisp
+++ b/binswood.lisp
@@ -7,12 +7,8 @@ (setf *default-zone-source* 'radius.distorted.org.uk.)
 ;; Binswood.  Address range retroactively claimed from Cambridge G-RIN.
 (defnet binswood.org.uk 10.165.27.0/24
   (binswood 256))
-(defhost netgear.binswood (binswood 1))
-(defhost linksys.binswood (binswood 2))
+(defhost binswrt.binswood (binswood 1))
 (defhost mango.binswood (binswood 3))
-(defhost hplaser.binswood (binswood 4))
-(defhost wifi-client-1.binswood (binswood 5))
-(defhost hplaser2.binswood (binswood 6))
 
 (defzone binswood.org.uk
 
@@ -20,25 +16,37 @@ (defzone binswood.org.uk
   :ns ((radius.ns :ip radius)
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
+       (national.ns :ip national)
        (mythic-beasts-1.ns :ip mythic-ns1)
-       (mythic-beasts-2.ns :ip mythic-ns2))
+       (mythic-beasts-2.ns :ip mythic-ns2)
+       (mythic-beasts-3.ns :ip mythic-ns3))
+
+  ;; Certification.
+  :caa ((:issue "letsencrypt.org")
+       (:issue "distorted.org.uk"))
 
   ;; Internal hosts.
-  (netgear :a netgear.binswood)
-  (linksys :a linksys.binswood)
+  (binswrt :a binswrt.binswood)
   (mango :a mango.binswood)
-  (hplaser :a hplaser.binswood)
-  (hplaser2 :a hplaser2.binswood)
-  (wifi-client-1 :a wifi-client-1.binswood)
 
   ;; External services.
   ((@ www) :svc stratocaster)
 
   ;; Dynamic addresses.
   (dyn :ns ((radius.ns.dyn :ip radius)
-           (precision.ns.dyn :ip precision)))
+           (vampire.ns.dyn :ip vampire)
+           (precision.ns.dyn :ip precision)
+           (telecaster.ns.dyn :ip telecaster)
+           (national.ns.dyn :ip national)))
   (ext :cname ext.dyn))
 
+(defzone dyn.binswood.org.uk
+  :ns ((radius.ns :ip radius)
+       (vampire.ns :ip vampire)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)))
+
 (defrevzone binswood
   :ns ((radius.ns :ip radius)
        (precision.ns :ip precision))