X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/76e1e45a2c8886a5d980e283e3972cfa2e627ef6..3f954bac0af9523ca9089243bf80ca871535fb00:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index b0d0d59..5bcd7c6 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -191,9 +191,10 @@ (defzone distorted.org.uk
   (fender :abbrev f (colo :abbrev fc) (jump :abbrev fj))
   (fender (colo :addr fender.colo :sshfp "fender")
 	  (jump :addr fender.jump :sshfp "fender"))
-  (precision :abbrev p (colo :abbrev pc) (jump :abbrev pj))
+  (precision :abbrev p (colo :abbrev pc) (jump :abbrev pj) (vpn :abbrev pv))
   (precision (colo :addr precision.colo :sshfp "precision")
-	     (jump :addr precision.jump :sshfp "precision"))
+	     (jump :addr precision.jump :sshfp "precision")
+	     (vpn :addr precision.vpn :sshfp "precision"))
   (telecaster :alias tele :abbrev t
 	      (colo :alias tele.colo :abbrev tc)
 	      (jump :alias tele.jump :abbrev tj))
@@ -204,9 +205,10 @@ (defzone distorted.org.uk
 		(jump :alias strat.jump :abbrev sj))
   (stratocaster (colo :addr stratocaster.colo :sshfp "stratocaster")
 		(jump :addr stratocaster.jump :sshfp "stratocaster"))
-  (jazz :abbrev z (colo :abbrev zc) (jump :abbrev zj))
+  (jazz :abbrev z (colo :abbrev zc) (jump :abbrev zj) (vpn :abbrev :zv))
   (jazz (colo :addr jazz.colo :sshfp "jazz")
 	(jump :addr jazz.jump :sshfp "jazz")
+	(vpn :addr jazz.vpn :sshfp "jazz")
 	(iodine :addr jazz.iodine :sshfp "jazz"))
 
   ;; Media server (on loan to Good Technology HSTG).
@@ -226,25 +228,35 @@ (defzone distorted.org.uk
   (evolution (safe :addr evolution.safe))
   (evolution :alias evo)
 
+  ;; Switches.
+  (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)
   (safe :net safe)
   (untrusted :net untrusted)
   (vampire :abbrev v
-	   (unsafe :abbrev vu) (dmz :abbrev vd)
+	   (unsafe :abbrev vu) (dmz :abbrev vd) (vpn :abbrev vv)
 	   (safe :abbrev vs) (untrusted :abbrev vx))
   (vampire (unsafe :addr vampire.unsafe :sshfp "vampire")
 	   (dmz :addr vampire.dmz :sshfp "vampire")
+	   (vpn :addr vampire.vpn :sshfp "vampire")
 	   (safe :addr vampire.safe :sshfp "vampire")
 	   (untrusted :addr vampire.untrusted :sshfp "vampire"))
   (ibanez :abbrev i (unsafe :abbrev iu) (dmz :abbrev id))
   (ibanez (unsafe :addr ibanez.unsafe :sshfp "ibanez")
 	  (dmz :addr ibanez.dmz :sshfp "ibanez"))
   (radius :abbrev r
-	  (unsafe :abbrev ru) (dmz :abbrev rd)
+	  (unsafe :abbrev ru) (dmz :abbrev rd) (vpn :abbrev rv)
 	  (safe :abbrev rs) (untrusted :abbrev rx))
   (radius (unsafe :addr radius.unsafe :sshfp "radius")
 	  (dmz :addr radius.dmz :sshfp "radius")
+	  (vpn :addr radius.vpn :sshfp "radius")
 	  (safe :addr radius.safe :sshfp "radius")
 	  (untrusted :addr radius.untrusted :sshfp "radius"))
   (roadstar :abbrev rg (unsafe :abbrev rgu) (dmz :abbrev rgd))
@@ -258,6 +270,8 @@ (defzone distorted.org.uk
   (artist (unsafe :addr artist.unsafe :sshfp "artist")
 	  (dmz :addr artist.dmz :sshfp "artist")
 	  (untrusted :addr artist.untrusted :sshfp "artist"))
+  (groove :abbrev gr)
+  (groove (unsafe :addr groove.unsafe :sshfp "groove"))
 
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp :abbrev g)
@@ -276,8 +290,6 @@ (defzone distorted.org.uk
   (orange (vpn :addr orange.vpn :sshfp "orange"))
   (haze :abbrev h)
   (haze (vpn :addr haze.vpn :sshfp "haze"))
-  (groove :abbrev gr)
-  (groove (vpn :addr groove.vpn :sshfp "groove"))
   (iodine :net iodine)
 
   ;; ITS.
@@ -292,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))))
 
 ;;;--------------------------------------------------------------------------
@@ -308,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))