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

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index bbe1663dcd067c0bf16ebbef11db6d498cae6b8f..2c1719e5055c6b6903787d3fdcf7546c640ead30 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -78,7 +78,7 @@ (defhost precision.jump (jump 6))
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
-(defhost jaguar.jump ((:ipv4 jump 11) (:ipv6 jump "::2:1")))
+(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")))
@@ -105,6 +105,7 @@ (defhost haze.unsafe ((:ipv6 unsafe "5056:a8ff:fe01:5654")))
 (defhost gretsch.unsafe ((:ipv6 unsafe "3a2c:4aff:fe6d:e768")))
 (defhost invader.safe ((:ipv6 safe "a00:27ff:fe94:a5d7")))
 (defhost marauder.safe ((:ipv6 safe "a00:27ff:fe6a:7846")))
+(defhost spirit.unsafe ((:ipv6 unsafe "568d:5aff:fed9:18b8")))
 
 ;; Safe network.
 (defhost radius.safe (safe 1))
@@ -113,6 +114,9 @@ (defhost evolution.safe (safe 3))
 (defhost grigsby.safe (safe 4))
 (defhost carling.safe (safe 5))
 (defhost tritan.safe (safe 6))
+(defhost kitkat.safe (safe 7))
+(defhost lunch.safe (safe 8))
+(defhost burntaxe.safe (safe 9))
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))
@@ -128,6 +132,7 @@ (defhost radius.vpn ((:ipv4 vpn 5) (:ipv6 vpn "::5:1")))
 (defhost precision.vpn ((:ipv4 vpn 6) (:ipv6 vpn "::6:1")))
 (defhost jazz.vpn ((:ipv4 vpn 7) (:ipv6 vpn "::7:1")))
 (defhost vampire.vpn ((:ipv4 vpn 8) (:ipv6 vpn "::8:1")))
+(defhost spirit.vpn ((:ipv4 vpn 9) (:ipv6 vpn "::9:1")))
 
 ;; Untrusted private network.
 (defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
@@ -138,6 +143,7 @@ (defhost jazz.iodine (iodine 1))
 ;; Hippotat network.
 (defhost jazz.hippo (hippo 1))
 (defhost crybaby.hippo (hippo 2))
+(defhost spirit.hippo (hippo 3))
 
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.
@@ -179,6 +185,6 @@    (defhost telecaster telecaster.jump)
    (defhost stratocaster stratocaster.jump)
    (defhost national national.linode)))
 
-(defhost jaguar jaguar.jump)
+(defhost marshall marshall.jump)
 
 ;;;----- That's all, folks --------------------------------------------------