distorted.lisp: Include nameservers in dhcp subzone.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 90f901401ad06247e5cae6ba59ef3e9f1c0cf28e..4a4b05a7078c70db8a96091459905cc2be59beb8 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -304,26 +304,47 @@ (defzone distorted.org.uk
   (dhcp :ns ((radius.ns.dhcp :ip radius)
             (precision.ns.dhcp :ip precision)
             (telecaster.ns.dhcp :ip telecaster)
-            (vampire.ns.dhcp :ip vampire)))
+            (vampire.ns.dhcp :ip vampire))
+       :ds ((55966 :rsasha256 :sha1
+            "95b05c1f4e84f950f29630004bac447f8a87ca33")
+            (55966 :rsasha256 :sha256
+             #.(concatenate 'string "31696bf54b577362b2eb75793adeb9ec"
+                                    "2e8440ec671371b35d8d978cd9ca3007"))))
   (dyn :ns ((radius.ns.dyn :ip radius)
            (precision.ns.dyn :ip precision)
            (telecaster.ns.dyn :ip telecaster)
-           (vampire.ns.dyn :ip vampire)))
+           (vampire.ns.dyn :ip vampire))
+       :ds ((11335 :rsasha256 :sha1
+           "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
+           (11335 :rsasha256 :sha256
+            #.(concatenate 'string "6eb15eb587c48f5b84ca128a656a4cce"
+                                   "0a41cf040d3d0f15a44dffd6476b2b55"))))
   (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)))
+              (vampire.ns.dnserr :ip vampire.dmz))
+         :ds ((40945 :rsasha256 :sha1
+               "f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
+              (40945 :rsasha256 :sha256
+               #.(concatenate 'string "fb171d206d4d64c5a7a6c290ce6e20df"
+                                      "44f1db7f41e2260f1fe8d7c55d524c11"))))
   (io :ns ((ns.io :ip jazz.jump))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
 (defzone dhcp.distorted.org.uk
+  :ns ((radius.ns :ip radius.dmz)
+       (precision.ns :ip precision.jump)
+       (telecaster.ns :ip telecaster.jump)
+       (vampire.ns :ip vampire.dmz))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.safe)
   (invader :addr invader.safe)
-  (marauder :addr marauder.safe))
+  (marauder :addr marauder.safe)
+  (haze :addr haze.unsafe)
+  (gretsch :addr gretsch.unsafe))
 
 (defzone nicko.org
   (richmond :addr richmond.jump))