From 1b9508ad37b8ea9d28f3135ec55a1833c13584db Mon Sep 17 00:00:00 2001
Message-Id: <1b9508ad37b8ea9d28f3135ec55a1833c13584db.1713927708.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 20 Apr 2014 14:44:41 +0100
Subject: [PATCH] Add telecaster as a public-facing nameserver.
Organization: Straylight/Edgeware

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

Annoyingly, precision has been a little flaky recently.  Provide some
good colocated backup.
---
 binswood.lisp  |  1 +
 distorted.lisp | 11 +++++++++++
 hosts.lisp     |  2 ++
 odin.lisp      |  5 +++--
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/binswood.lisp b/binswood.lisp
index fbba896..9f76fa5 100644
--- a/binswood.lisp
+++ b/binswood.lisp
@@ -19,6 +19,7 @@ (defzone binswood.org.uk
   ;; Nameservers
   :ns ((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))
 
diff --git a/distorted.lisp b/distorted.lisp
index 1702e1c..ae8d6ac 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -47,9 +47,11 @@ (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))
@@ -231,12 +233,15 @@ (defzone distorted.org.uk
   ;; Delegations.
   (dhcp :ns ((radius.ns.dhcp :ip radius)
 	     (precision.ns.dhcp :ip precision)
+	     (telecaster.ns.dhcp :ip telecaster)
 	     (vampire.ns.dhcp :ip vampire)))
   (dyn :ns ((radius.ns.dyn :ip radius)
 	    (precision.ns.dyn :ip precision)
+	    (telecaster.ns.dyn :ip telecaster)
 	    (vampire.ns.dyn :ip vampire)))
   (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)))
   (io :ns ((ns.io :ip jazz.jump))))
 
@@ -252,6 +257,7 @@ (defzone dhcp.distorted.org.uk
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
@@ -260,30 +266,35 @@ (defrevzone trusted
   :reverse any
   (dhcp :ns (radius.distorted.org.uk.
 	     precision.distorted.org.uk.
+	     telecaster.distorted.org.uk.
 	     vampire.distorted.org.uk.))
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
 (defrevzone dmz
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse dmz)
 
 (defrevzone jump
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse jump)
 
 (defrevzone distorted.org.uk-he
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse distorted.org.uk-he)
 
 (defrevzone distorted.org.uk-jump
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse distorted.org.uk-jump)
 
diff --git a/hosts.lisp b/hosts.lisp
index 7815980..50c3aa3 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -138,11 +138,13 @@ (preferred-subnet-case
   ((unsafe colo)
    (defhost radius radius.unsafe)
    (defhost precision precision.colo)
+   (defhost telecaster telecaster.colo)
    (defhost stratocaster stratocaster.colo)
    (defhost vampire vampire.unsafe))
   (t
    (defhost radius radius.dmz)
    (defhost precision precision.jump)
+   (defhost telecaster telecaster.jump)
    (defhost stratocaster stratocaster.jump)
    (defhost vampire vampire.dmz)))
 
diff --git a/odin.lisp b/odin.lisp
index 174e9ed..acce6a9 100644
--- a/odin.lisp
+++ b/odin.lisp
@@ -9,8 +9,9 @@ (setf *default-zone-source* 'radius.distorted.org.uk.)
 (defzone odin.gg
 
   ;; Nameservers
-  :ns ((radius-ns :ip radius)
-       (precision-ns :ip precision)
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
        (gandi6.ns :ip gandi-ns6))
 
   ;; Web service.
-- 
[mdw]