distorted.lisp, hosts.lisp: Add Nicko's new VM `marshall'.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index dd1a2ceb35a97fbadda52b3420b77cb60f01e97c..690c8dc29c953c1700d8f9bf1d13e14fafe4f6ab 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -231,11 +231,10 @@ (defzone distorted.org.uk
            (upn :addr national.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)
@@ -251,6 +250,10 @@ (defzone distorted.org.uk
   (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))