hosts.lisp, distorted.lisp: Proper assignments for colocated servers.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 7393a7c74633eb657c09a88439b64f82bcd5e315..fee2e5d6fe6bad48fd335835c6fe3cc95c838fe7 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -17,6 +17,9 @@ (defhost mythic-ns2 93.93.128.67)
 ;; 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
@@ -28,7 +31,9 @@ (defnet distorted.org.uk 172.29.198.0/23
       (dhcp 32)
       (safe 32))
     (virtual 32)
-    (its 4)))
+    (play 32
+      (its 4))
+    (colo 32)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
@@ -41,9 +46,17 @@ (defhost jem.dmz (dmz 4))
 (defhost artist.dmz (dmz 5))
 (defhost vampire.dmz (dmz 6))
 (defhost ibanez.dmz (dmz 9))
+(defhost anon.dmz (dmz 12))
 (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))
@@ -73,6 +86,13 @@ (defhost vampire.iodine (iodine 1))
 (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))
+
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.