X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/d85367121b47974387178add7ebe776f01ba5167..0865ffd5c82f41cab2f3fdfb41c7b39685b34b9c:/hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 8fc9924..9e3cabf 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -29,11 +29,12 @@
     (wired 128
       (unsafe 32)
       (dhcp 32))
-    (virtual 32)
+    (vpn 32)
     (nil 16
       (its 4))
     (colo 16)
-    (safe 32)))
+    (safe 32)
+    (any 32)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
@@ -56,6 +57,9 @@
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
+(defhost richmond.jump (jump 12))
+(defhost anon.jump (jump 13))
+(defhost blackhole.jump (jump 14))
 
 ;; Unsafe network.
 (defhost radius.unsafe (unsafe 1))
@@ -72,15 +76,16 @@
 
 ;; 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.virtual (virtual 1))
-(defhost terror.virtual (virtual 2))
+(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.
@@ -94,15 +99,28 @@
 (defhost stratocaster.colo (colo 4))
 (defhost jazz.colo (colo 5))
 
+;; Anycast addresses for services.
+(defhost dns0.any (any 0))
+(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.
 
 (preferred-subnet-case
-  (dmz
-   (defhost radius radius.dmz)
-   (defhost vampire vampire.dmz))
-  (t
+  ((unsafe colo)
    (defhost radius radius.unsafe)
-   (defhost vampire vampire.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 --------------------------------------------------