X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/f409e9c51d0c20dd45bc70cf2dbf0d8a9a0748e7..c32d96fac6d653c70d82990fdf17a0c885b65f7a:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index fbb1f8f..90f9014 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -191,9 +191,10 @@
   (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 @@
 		(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).
@@ -227,29 +229,34 @@
   (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)
   (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))
@@ -313,6 +320,7 @@
 
 (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))