Makefile, distorted.lisp, hosts.lisp: Finish renumbering for A&A switchover.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index c19979f..a969fe8 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -34,13 +34,14 @@
     (safe "192/27")
     (any "224/27")))
 
-;; Externally routable DMZ from Demon.
-(defnet dmz "62.49.204.144/28")
-
 ;; Externally routable DMZ from Andrews and Arnold.
-(defnet aaisp-gw "81.2.113.195")
-(defnet aaisp "81.187.238.128/28")
-(defnet aaisp "2001:8b0:c92/48")
+(defnet gw "81.2.113.195")
+(defnet dmz "81.187.238.128/28")
+(defnet distorted.org.uk-aaisp "2001:8b0:c92/48"
+  (unsafe "1/64")
+  (dmz "fff/64")
+  (safe "4001/64")
+  (untrusted "8001/64"))
 
 ;; Externally routed colo range.
 (defnet jump "212.13.198.66/28")
@@ -51,40 +52,21 @@
   (vpn "6000/64")
   (upn "a000/64"))
 
-;; Hurricane Electric IPv6-inIPv4 tunnel.
-(defnet he-tunnel "2001:470:1f08:1b98/64")
-(defnet dmz "2001:470:1f09:1b98/64")
-(defnet distorted.org.uk-he "2001:470:9740/48"
-  (unsafe "1/64")
-  (safe "4001/64")
-  (untrusted "8001/64"))
-
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
 
 ;; External addresses.
-(defhost guvnor.dmz ((:ipv4 dmz 1)))
-(defhost radius.dmz (dmz 2))
-(defhost roadstar.dmz (dmz 3))
-(defhost jem.dmz (dmz 4))
-(defhost artist.dmz (dmz 5))
-(defhost vampire.dmz (dmz 6))
-(defhost universe.dmz (dmz 7))
+(defhost guvnor.dmz ((:ipv4 gw 0) (:ipv6 dmz "::1:1")))
+(defhost radius.dmz (dmz 1))
+(defhost roadstar.dmz (dmz 2))
+(defhost jem.dmz (dmz 3))
+(defhost artist.dmz (dmz 4))
+(defhost vampire.dmz (dmz 5))
+(defhost universe.dmz (dmz 6))
 (defhost ibanez.dmz (dmz 9))
 (defhost anon.dmz (dmz 12))
 (defhost nat.dmz ((:ipv4 dmz 14)))
 
-(defhost guvnor.aaisp (aaisp-gw 0))
-(defhost radius.aaisp (aaisp 1))
-(defhost roadstar.aaisp (aaisp 2))
-(defhost jem.aaisp (aaisp 3))
-(defhost artist.aaisp (aaisp 4))
-(defhost vampire.aaisp (aaisp 5))
-(defhost universe.aaisp (aaisp 6))
-(defhost ibanez.aaisp (aaisp 9))
-(defhost anon.aaisp (aaisp 12))
-(defhost nat.aaisp ((:ipv4 aaisp 14)))
-
 ;; Colocated addresses.
 (defhost gate.jump ((:ipv6 jump 2)))
 (defhost fender.jump (jump 5))
@@ -112,13 +94,13 @@
 (defhost groove.unsafe (unsafe 17))
 
 ;; Client hosts, with IPv6 addresses.
-(defhost gibson.unsafe ((:ipv6 "2001:470:9740:1:e269:95ff:fe63:bb4")))
-(defhost crybaby.unsafe ((:ipv6 "2001:470:9740:1:216:eaff:fec2:4cb8")))
-(defhost lespaul.unsafe ((:ipv6 "2001:470:9740:1:a00:27ff:fef5:aaef")))
-(defhost haze.unsafe ((:ipv6 "2001:470:9740:1:5056:a8ff:fe01:5654")))
-(defhost gretsch.unsafe ((:ipv6 "2001:470:9740:1:3a2c:4aff:fe6d:e768")))
-(defhost invader.safe ((:ipv6 "2001:470:9740:4001:a00:27ff:fe94:a5d7")))
-(defhost marauder.safe ((:ipv6 "2001:470:9740:4001:a00:27ff:fe6a:7846")))
+(defhost gibson.unsafe ((:ipv6 unsafe "e269:95ff:fe63:bb4")))
+(defhost crybaby.unsafe ((:ipv6 unsafe "216:eaff:fec2:4cb8")))
+(defhost lespaul.unsafe ((:ipv6 unsafe "a00:27ff:fef5:aaef")))
+(defhost haze.unsafe ((:ipv6 unsafe "5056:a8ff:fe01:5654")))
+(defhost gretsch.unsafe ((:ipv6 unsafe "3a2c:4aff:fe6d:e768")))
+(defhost invader.safe ((:ipv6 safe "a00:27ff:fe94:a5d7")))
+(defhost marauder.safe ((:ipv6 safe "a00:27ff:fe6a:7846")))
 
 ;; Safe network.
 (defhost radius.safe (safe 1))