Include DS records explicitly; check them when diffing.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index a1ababa36a7edc733c80550f1c0bf23601d2ff28..5bcd7c63fc92dcab0acab4172f1df43237909c8c 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -229,9 +229,12 @@ (defzone distorted.org.uk
   (evolution :alias evo)
 
   ;; Switches.
-  (tp0 (safe :addr tp0.safe))
-  (tp1 (safe :addr tp1.safe))
-  (tp2 (safe :addr tp2.safe))
+  (grigsby :alias tp0)
+  (grigsby (safe :addr grigsby.safe))
+  (carling :alias tp1)
+  (carling (safe :addr carling.safe))
+  (tritan :alias tp2)
+  (tritan (safe :addr tritan.safe))
 
   ;; Wired ethernet.
   (unsafe :net unsafe)
@@ -301,15 +304,30 @@ (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))))
 
 ;;;--------------------------------------------------------------------------
@@ -317,9 +335,12 @@ (defzone distorted.org.uk
 
 (defzone dhcp.distorted.org.uk
   (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))