From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 Apr 2012 00:58:24 +0000 (+0100)
Subject: Use precision as an official nameserver.
X-Git-Url: https://git.distorted.org.uk/~mdw/zones/commitdiff_plain/f0209b9cd02f4feaffbefc386b27e86fde4a5922

Use precision as an official nameserver.

Withdraw vampire as an externally visible nameserver.  It remains a
stealth secondary, and continues to serve internal views.
---

diff --git a/distorted.lisp b/distorted.lisp
index 4c3b834..7e397e2 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -16,9 +16,10 @@
 
   ;; Nameservers.
   :ns #+view/inside ((radius.ns :ip radius)
+		     (precision.ns :ip precision)
 		     (vampire.ns :ip vampire))
       #-view/inside ((radius.ns :ip radius)
-		     (vampire.ns :ip vampire)
+		     (precision.ns :ip precision)
 		     (mythic-beasts-1.ns :ip mythic-ns1)
 		     (mythic-beasts-2.ns :ip mythic-ns2)
 		     (chiark.ns :ip chiark.greenend.org.uk))
@@ -142,8 +143,11 @@
   (blackhole (jump :a blackhole.jump))
 
   ;; Delegations.
-  (dhcp :ns (radius.ns vampire.ns))
+  (dhcp :ns ((radius.ns.dhcp :ip radius)
+	     (precision.ns.dhcp :ip precision)
+	     (vampire.ns.dhcp :ip vampire)))
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
+	       (precision.ns.dnserr :ip precision.jump)
 	       (vampire.ns.dnserr :ip vampire.dmz)))
   (io :ns ((ns.io :ip iodine.dmz))))
 
@@ -152,23 +156,28 @@
 
 (defrevzone trusted
   :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
        (vampire.ns :ip vampire))
   :reverse unsafe
   :reverse vpn
   :reverse colo
   :reverse its
   :reverse any
-  (dhcp :ns (radius.ns vampire.ns))
+  (dhcp :ns ((radius.ns.dhcp :ip radius)
+	     (precision.ns.dhcp :ip precision)
+	     (vampire.ns.dhcp :ip vampire)))
   :cidr-delegation
   (trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
 
 (defrevzone dmz
   :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
        (vampire.ns :ip vampire))
   :reverse dmz)
 
 (defrevzone jump
   :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
        (vampire.ns :ip vampire))
   :reverse jump)
 
diff --git a/felixpearce.lisp b/felixpearce.lisp
index 61873d1..552ae03 100644
--- a/felixpearce.lisp
+++ b/felixpearce.lisp
@@ -10,7 +10,7 @@
 
   ;; Nameservers
   :ns ((radius.ns :ip radius)
-       (vampire.ns :ip vampire)
+       (precision.ns :ip precision)
        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2))
 
diff --git a/harlequin.lisp b/harlequin.lisp
index 48f5628..15deeb7 100644
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -10,7 +10,7 @@
 
   ;; Nameservers
   :ns ((radius.ns :ip radius)
-       (vampire.ns :ip vampire)
+       (precision.ns :ip precision)
        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2))
 
diff --git a/hosts.lisp b/hosts.lisp
index 003fe5e..efb0e7f 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -110,9 +110,11 @@
 (preferred-subnet-case
   ((unsafe colo)
    (defhost radius radius.unsafe)
+   (defhost precision precision.colo)
    (defhost vampire vampire.unsafe))
   (t
    (defhost radius radius.dmz)
+   (defhost precision precision.jump)
    (defhost vampire vampire.dmz)))
 
 ;;;----- That's all, folks --------------------------------------------------