hosts.lisp, distorted.lisp: Add VPN address for `groove'.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 8cc4d41d9f8b33a2064aaf4f9b73b9b292409501..a35b3db32c7559475db68e8875f22a86bd8a80f3 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -185,7 +185,7 @@ (defzone distorted.org.uk
          (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
 
   ;; Internal services.
-  #+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire")
+  #+view/inside ((news lpr) :svc roadstar.unsafe :sshfp "roadstar")
 
   ;; Anonymity services.
   (anon (colo :svc jazz.colo)
@@ -229,13 +229,11 @@ (defzone distorted.org.uk
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))
   (national (linode :addr national.linode)
            (upn :addr national.upn))
+  (mdwdev (upn :addr mdwdev.upn))
 
-  ;; Media server (on loan to Good Technology HSTG).
-  (jaguar :abbrev jag)
-  (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))
-
-  ;; Nicko's server.
+  ;; Nicko's servers.
   (richmond (jump :svc richmond.jump))
+  (marshall (jump :svc marshall.jump))
 
   ;; Entry is via little router box.
   (dmz :net dmz)
@@ -246,9 +244,15 @@ (defzone distorted.org.uk
   (wireless :net wireless)
   (evolution (safe :addr evolution.safe))
   (evolution :alias evo)
+  (kitkat :alias ap0)
   (kitkat (safe :addr kitkat.safe))
+  (lunch :alias ap1)
   (lunch (safe :addr lunch.safe))
 
+  ;; Printer.
+  (burntaxe :alias lp0)
+  (burntaxe (safe :addr burntaxe.safe))
+
   ;; Switches.
   (grigsby :alias tp0)
   (grigsby (safe :addr grigsby.safe))
@@ -294,8 +298,10 @@ (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"))
+  (groove :abbrev gr
+         (unsafe :abbrev gru) (vpn :abbrev grv))
+  (groove (unsafe :addr groove.unsafe :sshfp "groove")
+         (vpn :addr groove.vpn :sshfp "groove"))
 
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp :abbrev g)