X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/04db972978345f878d837a37edd8a0ea677ee771..e40773afbcdabe46a3ab4aaf58e4ab2576cec561:/hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 926bbe6..b7fc5e5 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -17,6 +17,9 @@
 ;; Externally routable DMZ.
 (defnet dmz 62.49.204.144/28)
 
+;; Externally routed colo range.
+(defnet jump 212.13.198.66/28)
+
 ;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
 (defnet distorted.org.uk 172.29.198.0/23
   (untrusted 256
@@ -25,10 +28,13 @@
   (trusted 256
     (wired 128
       (unsafe 32)
-      (dhcp 32)
-      (safe 32))
-    (virtual 32)
-    (its 4)))
+      (dhcp 32))
+    (vpn 32)
+    (nil 16
+      (its 4))
+    (colo 16)
+    (safe 32)
+    (any 32)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
@@ -45,6 +51,13 @@
 (defhost gate.dmz (dmz 13))
 (defhost nat.dmz (dmz 14))
 
+;; Colocated addresses.
+(defhost fender.jump (jump 5))
+(defhost precision.jump (jump 6))
+(defhost telecaster.jump (jump 7))
+(defhost stratocaster.jump (jump 8))
+(defhost jazz.jump (jump 9))
+
 ;; Unsafe network.
 (defhost radius.unsafe (unsafe 1))
 (defhost roadstar.unsafe (unsafe 2))
@@ -54,8 +67,9 @@
 (defhost ibanez.unsafe (unsafe 14))
 
 ;; Safe network.
-(defhost tubescreamer.safe (safe 1))
-(defhost obsidian.safe (safe 2))
+(defhost radius.safe (safe 1))
+(defhost vampire.safe (safe 2))
+(defhost evolution.safe (safe 3))
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))
@@ -63,8 +77,8 @@
 (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))
 
 ;; Iodine network.
 (defhost vampire.iodine (iodine 1))
@@ -74,6 +88,20 @@
 (defhost gw.its (its 1))
 (defhost mz.its (its 2))
 
+;; Internal (VPN) addresses for colocated services.
+(defhost fender.colo (colo 1))
+(defhost precision.colo (colo 2))
+(defhost telecaster.colo (colo 3))
+(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))
+
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.