hosts.lisp, distorted.lisp: Allocate a separate address for iodine.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index fee2e5d6fe6bad48fd335835c6fe3cc95c838fe7..d62cc5e12dc296123200adde19875849c21426f1 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -28,12 +28,13 @@ (defnet distorted.org.uk 172.29.198.0/23
   (trusted 256
     (wired 128
       (unsafe 32)
-      (dhcp 32)
-      (safe 32))
-    (virtual 32)
-    (play 32
+      (dhcp 32))
+    (vpn 32)
+    (nil 16
       (its 4))
-    (colo 32)))
+    (colo 16)
+    (safe 32)
+    (any 32)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
@@ -46,6 +47,7 @@ (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))
@@ -66,8 +68,9 @@ (defhost vampire.unsafe (unsafe 5))
 (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))
@@ -75,8 +78,8 @@ (defhost evolution.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))
 
 ;; Iodine network.
 (defhost vampire.iodine (iodine 1))
@@ -93,15 +96,22 @@ (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.
 
 (preferred-subnet-case
-  (dmz
-   (defhost radius radius.dmz)
-   (defhost vampire vampire.dmz))
-  (t
+  ((unsafe colo)
    (defhost radius radius.unsafe)
-   (defhost vampire vampire.unsafe)))
+   (defhost vampire vampire.unsafe))
+  (t
+   (defhost radius radius.dmz)
+   (defhost vampire vampire.dmz)))
 
 ;;;----- That's all, folks --------------------------------------------------