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

diff --git a/distorted.lisp b/distorted.lisp
index 62bcd03..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,13 +229,11 @@
   (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)
@@ -300,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)