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 4c3b8342cf77c2b6d1d4d580e87612d670cc05a8..7e397e24b50c1240b80dd3eea0f669b3511366bb 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -16,9 +16,10 @@ (defzone distorted.org.uk
 
   ;; 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 @@ (defzone distorted.org.uk
   (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 @@ (defzone distorted.org.uk
 
 (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 61873d13d6007017d21448290a82e6fdfeb0a3de..552ae03335c2c1cb46481ae1bf39c5fe3468c3cd 100644 (file)
--- a/felixpearce.lisp
+++ b/felixpearce.lisp
@@ -10,7 +10,7 @@ (defzone felixpearce.com
 
   ;; 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 48f5628a56400837311d3355b5f6c66efb8fb59a..15deeb7c2626a2fb55998d83e178e55042b1035d 100644 (file)
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -10,7 +10,7 @@ (defzone harlequin.org.uk
 
   ;; 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 003fe5ef6e58426d1965832b1aaa818f826407ae..efb0e7fff84bb773b96fcc1cae61b1a810867bd2 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -110,9 +110,11 @@ (defhost www-cache.any (any 4))
 (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 --------------------------------------------------