binswood.lisp, hosts.lisp: Move network definition to specific file.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index d62cc5e12dc296123200adde19875849c21426f1..67b207c46d3689a20be1b33d3b809c48bfa9bb5e 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -47,7 +47,6 @@ (defhost jem.dmz (dmz 4))
 (defhost artist.dmz (dmz 5))
 (defhost vampire.dmz (dmz 6))
 (defhost ibanez.dmz (dmz 9))
-(defhost iodine.dmz (dmz 11))
 (defhost anon.dmz (dmz 12))
 (defhost gate.dmz (dmz 13))
 (defhost nat.dmz (dmz 14))
@@ -58,6 +57,8 @@ (defhost precision.jump (jump 6))
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
+(defhost richmond.jump (jump 12))
+(defhost blackhole.jump (jump 14))
 
 ;; Unsafe network.
 (defhost radius.unsafe (unsafe 1))
@@ -74,15 +75,16 @@ (defhost evolution.safe (safe 3))
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))
-(defhost evolution.untrusted (untrusted 2))
+(defhost artist.untrusted (untrusted 2))
 (defhost vampire.untrusted (untrusted 3))
 
 ;; Virtual private network.
 (defhost crybaby.vpn (vpn 1))
 (defhost terror.vpn (vpn 2))
+(defhost orange.vpn (vpn 3))
 
 ;; Iodine network.
-(defhost vampire.iodine (iodine 1))
+(defhost jazz.iodine (iodine 1))
 
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.
@@ -102,6 +104,8 @@ (defhost dns1.any (any 1))
 (defhost ntp0.any (any 2))
 (defhost ntp1.any (any 3))
 (defhost www-cache.any (any 4))
+(defhost krb0.any (any 5))
+(defhost krb1.any (any 6))
 
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.
@@ -109,9 +113,13 @@ (defhost www-cache.any (any 4))
 (preferred-subnet-case
   ((unsafe colo)
    (defhost radius radius.unsafe)
+   (defhost precision precision.colo)
+   (defhost stratocaster stratocaster.colo)
    (defhost vampire vampire.unsafe))
   (t
    (defhost radius radius.dmz)
+   (defhost precision precision.jump)
+   (defhost stratocaster stratocaster.jump)
    (defhost vampire vampire.dmz)))
 
 ;;;----- That's all, folks --------------------------------------------------