distorted.lisp: Use out-of-zone nameservers for reverse zones.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 2b5e744d161268d9998bb4446decb4b2b6898f81..4c2c8c1743cfd44de3d2202673c513ee671db9bb 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -123,7 +123,6 @@ (defzone distorted.org.uk
   ;; Entry is via little router box.
   (dmz :net dmz)
   (guvnor (dmz :addr guvnor.dmz))
-  (gate (dmz :addr gate.dmz))
   (nat (dmz :addr nat.dmz))
 
   ;; Wireless gateway.
@@ -164,6 +163,7 @@ (defzone distorted.org.uk
   ;; Colocated hosts.
   (colo :net colo)
   (jump :net jump)
+  (gate (jump :addr gate.jump :sshfp "precision"))
   (fender (colo :addr fender.colo :sshfp "fender")
          (jump :addr fender.jump :sshfp "fender"))
   (precision (colo :addr precision.colo :sshfp "precision")
@@ -244,29 +244,29 @@ (defzone distorted.org.uk
 ;;; Other subsidiary zones.
 
 (defrevzone trusted
-  :ns ((radius.ns :ip radius)
-       (precision.ns :ip precision)
-       (vampire.ns :ip vampire))
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       vampire.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
   :reverse colo
   :reverse its
   :reverse any
-  (dhcp :ns ((radius.ns.dhcp :ip radius)
-            (precision.ns.dhcp :ip precision)
-            (vampire.ns.dhcp :ip vampire)))
+  (dhcp :ns (radius.distorted.org.uk.
+            precision.distorted.org.uk.
+            vampire.distorted.org.uk.))
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
 (defrevzone dmz
-  :ns ((radius.ns :ip radius)
-       (precision.ns :ip precision)
-       (vampire.ns :ip vampire))
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       vampire.distorted.org.uk.)
   :reverse dmz)
 
 (defrevzone jump
-  :ns ((radius.ns :ip radius)
-       (precision.ns :ip precision)
-       (vampire.ns :ip vampire))
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       vampire.distorted.org.uk.)
   :reverse jump)
 
 (defzone io.distorted.org.uk