From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 13 Feb 2015 20:01:51 +0000 (+0000)
Subject: distorted.lisp: Publish our standard abbreviated names in a subdomain.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/commitdiff_plain/07fe1e4376449189989e507690a7f165f3930e6e

distorted.lisp: Publish our standard abbreviated names in a subdomain.

We've been using abbreviated names for our hosts for ages, but haven't
published the abbrevations in DNS.  Now they're all in the `abbrev'
subdomain, as CNAME records pointing at the primary names.

Also publish `strat.NET' and `tele.NET' aliases.  I don't know why
these weren't published before.

This is a bit ugly.  It'd be nice to work out a better way of doing it.
---

diff --git a/distorted.lisp b/distorted.lisp
index aa93638..acd1263 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -33,6 +33,27 @@ (defzoneparse :anycast (name data rec :prefix prefix :zname zname)
 						   (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.
 
@@ -177,21 +198,29 @@ (defzone distorted.org.uk
   (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))
   (precision (colo :addr precision.colo :sshfp "precision")
 	     (jump :addr precision.jump :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))
   (jazz (colo :addr jazz.colo :sshfp "jazz")
 	(jump :addr jazz.jump :sshfp "jazz")
 	(iodine :addr jazz.iodine :sshfp "jazz"))
 
   ;; Media server (on loan to Good Technology HSTG).
+  (jaguar :abbrev jag)
   (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))
 
   ;; Nicko's server.
@@ -201,26 +230,37 @@ (defzone distorted.org.uk
   (unsafe :net unsafe)
   (safe :net safe)
   (untrusted :net untrusted)
+  (vampire :abbrev v
+	   (unsafe :abbrev vu) (dmz :abbrev vd)
+	   (safe :abbrev vs) (untrusted :abbrev vx))
   (vampire (unsafe :addr vampire.unsafe :sshfp "vampire")
 	   (dmz :addr vampire.dmz :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)
+	  (safe :abbrev rs) (untrusted :abbrev rx))
   (radius (unsafe :addr radius.unsafe :sshfp "radius")
 	  (dmz :addr radius.dmz :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"))
 
   ;; DHCP hosts.
-  (gibson :cname gibson.dhcp)
+  (gibson :cname gibson.dhcp :abbrev g)
   (lespaul :cname lespaul.dhcp)
   (firebird :cname firebird.dhcp)
   (marauder :cname marauder.dhcp)
@@ -229,10 +269,14 @@ (defzone distorted.org.uk
 
   ;; 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"))
+  (groove :abbrev gr)
   (groove (vpn :addr groove.vpn :sshfp "groove"))
   (iodine :net iodine)