X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/5a8c792f8342eb3fd1852e54baaf9120afd92bd8..668d8477199b901515e9de79341568b13cdb4521:/distorted.lisp?ds=sidebyside

diff --git a/distorted.lisp b/distorted.lisp
index 3b0b297..22f6726 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -67,16 +67,19 @@ (setf *default-zone-source* 'radius.distorted.org.uk.)
 (defzone distorted.org.uk
 
   ;; Nameservers.
-  :ns #+view/inside ((radius.ns :ip radius)
-		     (precision.ns :ip precision)
-		     (telecaster.ns :ip telecaster)
-		     (vampire.ns :ip vampire))
-      #-view/inside ((radius.ns :ip radius)
-		     (precision.ns :ip precision)
-		     (telecaster.ns :ip telecaster)
-		     (mythic-beasts-1.ns :ip mythic-ns1)
-		     (mythic-beasts-2.ns :ip mythic-ns2)
-		     (chiark.ns :ip chiark.greenend.org.uk))
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)
+       #+view/inside (vampire.ns :ip vampire)
+       #-view/inside (mythic-beasts-1.ns :ip mythic-ns1)
+       #-view/inside (mythic-beasts-2.ns :ip mythic-ns2)
+       #-view/inside (mythic-beasts-3.ns :ip mythic-ns3)
+       #-view/inside (chiark.ns :ip chiark.greenend.org.uk))
+
+  ;; Certification.
+  :caa ((:issue "letsencrypt.org")
+	(:issue "distorted.org.uk"))
 
   ;; Mail servers.
   ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
@@ -141,29 +144,39 @@ (defzone distorted.org.uk
 	(:ftp ftp))
 
   ;; Colocated services.
-  ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
-		  (jump :svc jazz.jump :sshfp "jazz"))
-  ((bugs lists) (colo :svc telecaster.colo :sshfp "telecaster")
-		(jump :svc telecaster.jump :sshfp "telecaster"))
+  ((irc vox keys wiki) (colo :svc jazz.colo :sshfp "jazz")
+		       (jump :svc jazz.jump :sshfp "jazz"))
+  ((irc vox keys wiki) :tlsa (:https (:service-certificate-constraint
+				      :public-key :sha-256 #p"https-jazz")))
+  ((bugs lists db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
+		       (jump :svc telecaster.jump :sshfp "telecaster"))
+  ((bugs lists ftp) :tlsa (:https #3=(:service-certificate-constraint
+				      :public-key :sha-256
+				      #p"https-telecaster")))
+  (dyndns :svc telecaster.jump :sshfp "telecaster")
   ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster")
 		  (jump :svc stratocaster.jump :sshfp "stratocaster"))
-  ((www git mail @) :tlsa (:https (:service-certificate-constraint
-				   :public-key :sha-256
-				   #p"https-stratocaster")))
+  ((www git mail @) :tlsa (:https #2=(:service-certificate-constraint
+				      :public-key :sha-256
+				      #p"https-stratocaster")))
   (www-cache :tlsa (3127 #1=(:trust-anchor-assertion
 			     :certificate :sha-256 #p"distorted-ca")))
-  ((bugs lists) :tlsa (:smtp #1#))
-  (mail :tlsa ((:smtp :submission :imap :imaps) #1#))
+  (mail :tlsa ((:submission :imap :imaps) #1# #3#))
+  (mail :tlsa (:smtp #1#
+	       (:domain-issued-certificate
+		:public-key :sha-256 #p"smtps-stratocaster")))
+  ((bugs lists) :tlsa (:smtp #1#
+	       (:domain-issued-certificate
+		:public-key :sha-256 #p"smtps-telecaster")))
   :svc #+view/inside stratocaster.colo
        #-view/inside stratocaster.jump
   (cabal :svc stratocaster.colo :sshfp "stratocaster")
-  ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
-	    (jump :svc telecaster.jump :sshfp "telecaster"))
-  (dyndns :svc telecaster.jump :sshfp "telecaster")
 
   ;; Local services.
-  ((rawk pifi) (unsafe :svc artist.unsafe)
-	       (dmz :svc artist.dmz))
+  (rawk (unsafe :svc artist.unsafe) (dmz :svc artist.dmz))
+  (rawk :tlsa (:https (:service-certificate-constraint
+		       :public-key :sha-256
+		       #p"https-artist")))
   (mirror (dmz :svc roadstar.dmz :sshfp "roadstar")
 	  (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
 
@@ -178,6 +191,7 @@ (defzone distorted.org.uk
 
   ;; Fancy connectivity.
   (iodine (jump :svc jazz.jump))
+  (hippotat (jump :svc jazz.jump))
 
   ;; Colocated hosts.
   (colo :net colo)
@@ -204,7 +218,8 @@ (defzone distorted.org.uk
   (jazz (colo :addr jazz.colo :sshfp "jazz")
 	(jump :addr jazz.jump :sshfp "jazz")
 	(vpn :addr jazz.vpn :sshfp "jazz")
-	(iodine :addr jazz.iodine :sshfp "jazz"))
+	(iodine :addr jazz.iodine :sshfp "jazz")
+	(hippo :addr jazz.hippo :sshfp "jazz"))
 
   ;; Virtual hosts.
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))
@@ -265,6 +280,9 @@ (defzone distorted.org.uk
   (jem :abbrev j (unsafe :abbrev ju) (dmz :abbrev jd))
   (jem (unsafe :addr jem.unsafe :sshfp "jem")
        (dmz :addr jem.dmz :sshfp "jem"))
+  (universe :abbrev u (unsafe :abbrev uu) (dmz :abbrev ud))
+  (universe (unsafe :addr universe.unsafe :sshfp "universe")
+	    (dmz :addr universe.dmz :sshfp "universe"))
   (artist :abbrev a
 	  (unsafe :abbrev au) (dmz :abbrev ad) (untrusted :abbrev ax))
   (artist (unsafe :addr artist.unsafe :sshfp "artist")
@@ -284,13 +302,15 @@ (defzone distorted.org.uk
   ;; Virtual network.
   (vpn :net vpn)
   (crybaby :abbrev cb)
-  (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby"))
+  (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby")
+	   (hippo :addr crybaby.hippo :sshfp "crybaby"))
   (terror (vpn :addr terror.vpn :sshfp "terror"))
   (orange :abbrev o)
   (orange (vpn :addr orange.vpn :sshfp "orange"))
   (haze :abbrev h)
   (haze (vpn :addr haze.vpn :sshfp "haze"))
   (iodine :net iodine)
+  (hippo :net hippo)
 
   ;; ITS.
   (its :net its)
@@ -302,27 +322,30 @@ (defzone distorted.org.uk
 
   ;; Delegations.
   (dhcp :ns ((radius.ns.dhcp :ip radius)
+	     (vampire.ns.dhcp :ip vampire)
 	     (precision.ns.dhcp :ip precision)
 	     (telecaster.ns.dhcp :ip telecaster)
-	     (vampire.ns.dhcp :ip vampire))
+	     (national.ns.dhcp :ip national))
 	:ds ((55966 :rsasha256 :sha1
 	     "95b05c1f4e84f950f29630004bac447f8a87ca33")
 	     (55966 :rsasha256 :sha256
 	      #.(concatenate 'string "31696bf54b577362b2eb75793adeb9ec"
 				     "2e8440ec671371b35d8d978cd9ca3007"))))
   (dyn :ns ((radius.ns.dyn :ip radius)
+	    (vampire.ns.dyn :ip vampire)
 	    (precision.ns.dyn :ip precision)
 	    (telecaster.ns.dyn :ip telecaster)
-	    (vampire.ns.dyn :ip vampire))
+	    (national.ns.dyn :ip national))
        :ds ((11335 :rsasha256 :sha1
 	    "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
 	    (11335 :rsasha256 :sha256
 	     #.(concatenate 'string "6eb15eb587c48f5b84ca128a656a4cce"
 				    "0a41cf040d3d0f15a44dffd6476b2b55"))))
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
+	       (vampire.ns.dnserr :ip vampire.dmz)
 	       (precision.ns.dnserr :ip precision.jump)
-	       (telecaster.ns.dnserr :ip telecaster)
-	       (vampire.ns.dnserr :ip vampire.dmz))
+	       (telecaster.ns.dnserr :ip telecaster.jump)
+	       (national.ns.dnserr :ip national.linode))
 	  :ds ((40945 :rsasha256 :sha1
 		"f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
 	       (40945 :rsasha256 :sha256
@@ -335,9 +358,10 @@ (defzone distorted.org.uk
 
 (defzone dhcp.distorted.org.uk
   :ns ((radius.ns :ip radius.dmz)
+       (vampire.ns :ip vampire.dmz)
        (precision.ns :ip precision.jump)
        (telecaster.ns :ip telecaster.jump)
-       (vampire.ns :ip vampire.dmz))
+       (national.ns :ip national.linode))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
@@ -346,79 +370,117 @@ (defzone dhcp.distorted.org.uk
   (invader :addr invader.safe)
   (marauder :addr marauder.safe))
 
+(defzone dyn.distorted.org.uk
+  :ns ((radius.ns :ip radius)
+       (vampire.ns :ip vampire)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)))
+
 (defzone nicko.org
   (richmond :addr richmond.jump))
 
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       national.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
   :reverse colo
   :reverse its
   :reverse any
   (dhcp :ns (radius.distorted.org.uk.
+	     vampire.distorted.org.uk.
 	     precision.distorted.org.uk.
 	     telecaster.distorted.org.uk.
-	     vampire.distorted.org.uk.))
+	     national.distorted.org.uk.))
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
-(defrevzone (dmz :family :ipv6)
+(defzone dhcp.199.29.172.in-addr.arpa
   :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
-  :reverse dmz)
+       national.distorted.org.uk.))
 
-(defrevzone (dmz :family :ipv4)
-  (144-159 :ns (radius.distorted.org.uk.
-		precision.distorted.org.uk.
-		telecaster.distorted.org.uk.
-		vampire.distorted.org.uk.))
-  :multi ((dmz :suffix "144-159") :cname *))
+(defrevzone untrusted
+  :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       national.distorted.org.uk.))
 
-(defzone 144-159.204.49.62.in-addr.arpa
+(defzone 128-143.238.187.81.in-addr.arpa
   :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       national.distorted.org.uk.
+       secondary-dns.co.uk.)
   :reverse ((((:ipv4 dmz)))))
 
+(defzone 195.113.2.81.in-addr.arpa
+  :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       national.distorted.org.uk.
+       secondary-dns.co.uk.)
+  :reverse ((((:ipv4 gw)))))
+
 (defrevzone (jump :family :ipv6)
   :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       national.distorted.org.uk.)
   :reverse jump)
 
 (defrevzone (jump :family :ipv4)
   (64-79 :ns (radius.distorted.org.uk.
+	      vampire.distorted.org.uk.
 	      precision.distorted.org.uk.
 	      telecaster.distorted.org.uk.
-	      vampire.distorted.org.uk.))
+	      national.distorted.org.uk.))
   :multi ((jump :suffix "64-79") :cname *))
 
 (defzone 64-79.198.13.212.in-addr.arpa
   :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       national.distorted.org.uk.)
   :reverse ((((:ipv4 jump)))))
 
-(defrevzone distorted.org.uk-he
+(defrevzone (distorted.org.uk-aaisp :family :ipv6)
+  :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       national.distorted.org.uk.
+       secondary-dns.co.uk.)
+  (0.7.3.6.8.6.4.6.1.0.0.0 :ns (radius.distorted.org.uk.
+				vampire.distorted.org.uk.
+				precision.distorted.org.uk.
+				telecaster.distorted.org.uk.
+				national.distorted.org.uk.))
+  :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
+
+(defrevzone (dhcp :family :ipv6)
   :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
-  :reverse distorted.org.uk-he)
+       national.distorted.org.uk.))
 
 (defrevzone distorted.org.uk-jump
   :ns (radius.distorted.org.uk.
+       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       national.distorted.org.uk.)
   :reverse distorted.org.uk-jump)
 
 (defzone io.distorted.org.uk