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

diff --git a/distorted.lisp b/distorted.lisp
index 2f25348987ab394bb9f75afb8103b8a63d2f7b28..690c8dc29c953c1700d8f9bf1d13e14fafe4f6ab 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -232,8 +232,9 @@ (defzone distorted.org.uk
 
   ;; Media server (on loan to Good Technology HSTG).
 
-  ;; 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)

diff --git a/hosts.lisp b/hosts.lisp
index d3f3e023fd785a370662fc78975e1dd5095fdbda..2c1719e5055c6b6903787d3fdcf7546c640ead30 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -78,6 +78,7 @@ (defhost precision.jump (jump 6))
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
+(defhost marshall.jump ((:ipv4 jump 11) (:ipv6 jump "::2:1")))
 (defhost richmond.jump ((:ipv4 jump 12) (:ipv6 jump "::1:1")))
 (defhost anon.jump (jump 13))
 (defhost blackhole.jump ((:ipv4 jump 14) (:ipv6 jump "::ffff")))
@@ -184,5 +185,6 @@    (defhost telecaster telecaster.jump)
    (defhost stratocaster stratocaster.jump)
    (defhost national national.linode)))
 
+(defhost marshall marshall.jump)
 
 ;;;----- That's all, folks --------------------------------------------------