X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/6fcf076f492f8533197ab8cffd908d6d8c9950d6..a1ab9d7efb02c2185980c2fd6a0a417a0f5a2b62:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index c62ee34..4a4b05a 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -28,9 +28,31 @@ (defzoneparse :anycast (name data rec :prefix prefix :zname zname)
     (dolist (provider (list* any-provider default-provider other-providers))
       (zone-set-address #'rec (cdr provider)
 			:make-ptr-p (eq provider any-provider)
-			:name (concatenate 'string prefix "."
-					   (string-downcase (car provider))
-					   "." (string-downcase zname))))))
+			:name (domain-name-concat prefix
+						  (zone-parse-host
+						   (car provider)
+						   zname))))))
+
+;;;--------------------------------------------------------------------------
+;;; Hostname abbreviations.
+
+(defvar *abbrev-subdomain*
+  (make-domain-name :labels '("abbrev") :absolutep nil))
+(defparameter *abbrev-used* (make-hash-table :test #'equal))
+
+(defzoneparse :abbrev (name data rec :zname zname)
+  (let* ((domain (zone-parse-host data
+				  (domain-name-concat *abbrev-subdomain*
+						      zname)))
+	 (key (princ-to-string domain))
+	 (existing (gethash key *abbrev-used*)))
+    (when existing
+      (error "Abbrev collision for ~A between ~A and ~A."
+	     domain existing name))
+    (setf (gethash key *abbrev-used*) name)
+    (rec :name domain
+	 :type :cname
+	 :data name)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other definitions.
@@ -57,7 +79,7 @@ (defzone distorted.org.uk
 		     (chiark.ns :ip chiark.greenend.org.uk))
 
   ;; Mail servers.
-  ((@ mail)
+  ((@ mail blackhole)
    :mx mail
    :srv ((:smtp mail)))
   ((lists bugs cryptomail)
@@ -122,26 +144,26 @@ (defzone distorted.org.uk
   :srv ((:http www)
 	(:ftp ftp))
 
-  ;; Entry is via little router box.
-  (dmz :net dmz)
-  (guvnor (dmz :addr guvnor.dmz))
-  (nat (dmz :addr nat.dmz))
-
-  ;; Wireless gateway.
-  (wireless :net wireless)
-  (evolution (safe :addr evolution.safe))
-  (evolution :alias evo)
-
   ;; Colocated services.
-  ((irc vox) (colo :svc jazz.colo :sshfp "jazz")
-	     (jump :svc jazz.jump :sshfp "jazz"))
+  ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
+		  (jump :svc jazz.jump :sshfp "jazz"))
   ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster")
 		  (jump :svc stratocaster.jump :sshfp "stratocaster"))
+  ((www @) :tlsa (:https (:service-certificate-constraint
+			  :certificate :sha-256 #p"http-server-www#1")))
+  (git :tlsa (:https (:trust-anchor-assertion
+		      :certificate :sha-256 #p"distorted-ca")))
+  (www-cache :tlsa (3127 (:trust-anchor-assertion
+			  :certificate :sha-256 #p"distorted-ca")))
+  (mail :tlsa ((:smtp :submission :imap)
+	       (:trust-anchor-assertion
+		:certificate :sha-256 #p"distorted-ca")))
   :svc #+view/inside stratocaster.colo
        #-view/inside stratocaster.jump
   (cabal :svc stratocaster.colo :sshfp "stratocaster")
-  ((db ftp dyndns) (colo :svc telecaster.colo :sshfp "telecaster")
-		   (jump :svc telecaster.jump :sshfp "telecaster"))
+  ((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)
@@ -160,66 +182,114 @@ (defzone distorted.org.uk
 	(dmz :addr anon.dmz))
 
   ;; Fancy connectivity.
-  (iodine (jump :addr jazz.jump))
+  (iodine (jump :svc jazz.jump))
 
   ;; Colocated hosts.
   (colo :net colo)
   (jump :net jump)
   (gate (jump :addr gate.jump :sshfp "precision"))
+  (fender :abbrev f (colo :abbrev fc) (jump :abbrev fj))
   (fender (colo :addr fender.colo :sshfp "fender")
 	  (jump :addr fender.jump :sshfp "fender"))
+  (precision :abbrev p (colo :abbrev pc) (jump :abbrev pj) (vpn :abbrev pv))
   (precision (colo :addr precision.colo :sshfp "precision")
-	     (jump :addr precision.jump :sshfp "precision"))
+	     (jump :addr precision.jump :sshfp "precision")
+	     (vpn :addr precision.vpn :sshfp "precision"))
+  (telecaster :alias tele :abbrev t
+	      (colo :alias tele.colo :abbrev tc)
+	      (jump :alias tele.jump :abbrev tj))
   (telecaster (colo :addr telecaster.colo :sshfp "telecaster")
 	      (jump :addr telecaster.jump :sshfp "telecaster"))
-  (telecaster :alias tele)
+  (stratocaster :alias strat :abbrev s
+		(colo :alias strat.colo :abbrev sc)
+		(jump :alias strat.jump :abbrev sj))
   (stratocaster (colo :addr stratocaster.colo :sshfp "stratocaster")
 		(jump :addr stratocaster.jump :sshfp "stratocaster"))
-  (stratocaster :alias strat)
+  (jazz :abbrev z (colo :abbrev zc) (jump :abbrev zj) (vpn :abbrev :zv))
   (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"))
 
   ;; Media server (on loan to Good Technology HSTG).
-  (jaguar (jump :addr jaguar.jump))
+  (jaguar :abbrev jag)
+  (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))
 
   ;; Nicko's server.
-  (richmond (jump :addr richmond.jump))
+  (richmond (jump :svc richmond.jump))
+
+  ;; Entry is via little router box.
+  (dmz :net dmz)
+  (guvnor (dmz :addr guvnor.dmz))
+  (nat (dmz :addr nat.dmz))
+
+  ;; Wireless gateway.
+  (wireless :net wireless)
+  (evolution (safe :addr evolution.safe))
+  (evolution :alias evo)
+
+  ;; Switches.
+  (grigsby :alias tp0)
+  (grigsby (safe :addr grigsby.safe))
+  (carling :alias tp1)
+  (carling (safe :addr carling.safe))
+  (tritan :alias tp2)
+  (tritan (safe :addr tritan.safe))
 
   ;; Wired ethernet.
   (unsafe :net unsafe)
   (safe :net safe)
   (untrusted :net untrusted)
+  (vampire :abbrev v
+	   (unsafe :abbrev vu) (dmz :abbrev vd) (vpn :abbrev vv)
+	   (safe :abbrev vs) (untrusted :abbrev vx))
   (vampire (unsafe :addr vampire.unsafe :sshfp "vampire")
 	   (dmz :addr vampire.dmz :sshfp "vampire")
+	   (vpn :addr vampire.vpn :sshfp "vampire")
 	   (safe :addr vampire.safe :sshfp "vampire")
 	   (untrusted :addr vampire.untrusted :sshfp "vampire"))
+  (ibanez :abbrev i (unsafe :abbrev iu) (dmz :abbrev id))
   (ibanez (unsafe :addr ibanez.unsafe :sshfp "ibanez")
 	  (dmz :addr ibanez.dmz :sshfp "ibanez"))
+  (radius :abbrev r
+	  (unsafe :abbrev ru) (dmz :abbrev rd) (vpn :abbrev rv)
+	  (safe :abbrev rs) (untrusted :abbrev rx))
   (radius (unsafe :addr radius.unsafe :sshfp "radius")
 	  (dmz :addr radius.dmz :sshfp "radius")
+	  (vpn :addr radius.vpn :sshfp "radius")
 	  (safe :addr radius.safe :sshfp "radius")
 	  (untrusted :addr radius.untrusted :sshfp "radius"))
+  (roadstar :abbrev rg (unsafe :abbrev rgu) (dmz :abbrev rgd))
   (roadstar (unsafe :addr roadstar.unsafe :sshfp "roadstar")
 	    (dmz :addr roadstar.dmz :sshfp "roadstar"))
+  (jem :abbrev j (unsafe :abbrev ju) (dmz :abbrev jd))
   (jem (unsafe :addr jem.unsafe :sshfp "jem")
        (dmz :addr jem.dmz :sshfp "jem"))
+  (artist :abbrev a
+	  (unsafe :abbrev au) (dmz :abbrev ad) (untrusted :abbrev ax))
   (artist (unsafe :addr artist.unsafe :sshfp "artist")
 	  (dmz :addr artist.dmz :sshfp "artist")
 	  (untrusted :addr artist.untrusted :sshfp "artist"))
+  (groove :abbrev gr)
+  (groove (unsafe :addr groove.unsafe :sshfp "groove"))
 
   ;; DHCP hosts.
-  (gibson :cname gibson.dhcp)
+  (gibson :cname gibson.dhcp :abbrev g)
   (lespaul :cname lespaul.dhcp)
   (firebird :cname firebird.dhcp)
   (marauder :cname marauder.dhcp)
   (invader :cname invader.dhcp)
+  (gretsch :cname gretsch.dhcp)
 
   ;; Virtual network.
   (vpn :net vpn)
+  (crybaby :abbrev cb)
   (crybaby (vpn :addr crybaby.vpn :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)
 
   ;; ITS.
@@ -234,25 +304,50 @@ (defzone distorted.org.uk
   (dhcp :ns ((radius.ns.dhcp :ip radius)
 	     (precision.ns.dhcp :ip precision)
 	     (telecaster.ns.dhcp :ip telecaster)
-	     (vampire.ns.dhcp :ip vampire)))
+	     (vampire.ns.dhcp :ip vampire))
+	:ds ((55966 :rsasha256 :sha1
+	     "95b05c1f4e84f950f29630004bac447f8a87ca33")
+	     (55966 :rsasha256 :sha256
+	      #.(concatenate 'string "31696bf54b577362b2eb75793adeb9ec"
+				     "2e8440ec671371b35d8d978cd9ca3007"))))
   (dyn :ns ((radius.ns.dyn :ip radius)
 	    (precision.ns.dyn :ip precision)
 	    (telecaster.ns.dyn :ip telecaster)
-	    (vampire.ns.dyn :ip vampire)))
+	    (vampire.ns.dyn :ip vampire))
+       :ds ((11335 :rsasha256 :sha1
+	    "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
+	    (11335 :rsasha256 :sha256
+	     #.(concatenate 'string "6eb15eb587c48f5b84ca128a656a4cce"
+				    "0a41cf040d3d0f15a44dffd6476b2b55"))))
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
 	       (precision.ns.dnserr :ip precision.jump)
 	       (telecaster.ns.dnserr :ip telecaster)
-	       (vampire.ns.dnserr :ip vampire.dmz)))
+	       (vampire.ns.dnserr :ip vampire.dmz))
+	  :ds ((40945 :rsasha256 :sha1
+		"f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
+	       (40945 :rsasha256 :sha256
+		#.(concatenate 'string "fb171d206d4d64c5a7a6c290ce6e20df"
+				       "44f1db7f41e2260f1fe8d7c55d524c11"))))
   (io :ns ((ns.io :ip jazz.jump))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
 (defzone dhcp.distorted.org.uk
+  :ns ((radius.ns :ip radius.dmz)
+       (precision.ns :ip precision.jump)
+       (telecaster.ns :ip telecaster.jump)
+       (vampire.ns :ip vampire.dmz))
   (gibson :addr gibson.unsafe)
+  (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.safe)
   (invader :addr invader.safe)
-  (marauder :addr marauder.safe))
+  (marauder :addr marauder.safe)
+  (haze :addr haze.unsafe)
+  (gretsch :addr gretsch.unsafe))
+
+(defzone nicko.org
+  (richmond :addr richmond.jump))
 
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
@@ -270,20 +365,48 @@ (defrevzone trusted
 	     vampire.distorted.org.uk.))
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
-(defrevzone dmz
+(defrevzone (dmz :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse dmz)
 
-(defrevzone jump
+(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 *))
+
+(defzone 144-159.204.49.62.in-addr.arpa
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse ((((:ipv4 dmz)))))
+
+(defrevzone (jump :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse jump)
 
+(defrevzone (jump :family :ipv4)
+  (64-79 :ns (radius.distorted.org.uk.
+	      precision.distorted.org.uk.
+	      telecaster.distorted.org.uk.
+	      vampire.distorted.org.uk.))
+  :multi ((jump :suffix "64-79") :cname *))
+
+(defzone 64-79.198.13.212.in-addr.arpa
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse ((((:ipv4 jump)))))
+
 (defrevzone distorted.org.uk-he
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.