X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/e30dcd9fe431be8df496a1032222c952213e6608..2af6f6bd78893d7a2f4d4f5909c73c832702597d:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index a03fa04..a35b3db 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -185,7 +185,7 @@
 	  (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,23 +229,29 @@
   (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)
   (guvnor (dmz :addr guvnor.dmz))
   (nat (dmz :addr nat.dmz))
 
-  ;; Wireless gateway.
+  ;; Wireless access points.
   (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)
@@ -292,8 +298,10 @@
   (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)
@@ -308,6 +316,8 @@
   (crybaby :abbrev cb)
   (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby")
 	   (hippo :addr crybaby.hippo :sshfp "crybaby"))
+  (spirit (vpn :addr spirit.vpn :sshfp "spirit")
+	  (hippo :addr spirit.hippo :sshfp "spirit"))
   (terror (vpn :addr terror.vpn :sshfp "terror"))
   (orange :abbrev o)
   (orange (vpn :addr orange.vpn :sshfp "orange"))
@@ -370,6 +380,7 @@
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
   (gretsch :addr gretsch.unsafe)
+  (spirit :addr spirit.unsafe)
   (haze :addr haze.unsafe)
   (invader :addr invader.safe)
   (marauder :addr marauder.safe))