X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/7c0d176164ee07b13e5c861a95a44c3c7ae6dfe9..bda4d30e98bbdd8a499c9d2faa31e7e61de6c00f:/hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index c19979f..79c07e5 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -7,12 +7,14 @@
 
 (defhost boyle.nsict.org ((:ipv4 "85.158.42.162")))
 (defhost chiark.greenend.org.uk ((:ipv4 "212.13.197.229")
-				 (:ipv6 "2001:ba8:1e3::")))
+				 #+chiark-dns-ipv6 (:ipv6 "2001:ba8:1e3::")))
 (defhost mccoy.flatline.org.uk "80.74.241.31")
-(defhost mythic-ns1 ((:ipv4 "69.56.173.190")
-		     (:ipv6 "2600:3c00::f03c:91ff:fe96:beac")))
+(defhost mythic-ns1 ((:ipv4 "45.33.127.156")
+		     (:ipv6 "2600:3c00:e000:19::1")))
 (defhost mythic-ns2 ((:ipv4 "93.93.128.67")
 		     (:ipv6 "2a00:1098:0:80:1000::10")))
+(defhost mythic-ns3 ((:ipv4 "185.24.221.32")
+		     (:ipv6 "2a02:2770:11:0:21a:4aff:febe:759b")))
 (defhost gandi-ns6 ((:ipv4 "217.70.177.40")))
 
 ;;;--------------------------------------------------------------------------
@@ -23,6 +25,7 @@
   (untrusted "198.0/24"
     (wireless "0/25")
     (iodine "128/28")
+    (hippo "144/28")
     (upn "160/27"))
   (trusted "199.0/24"
     (wired "0/25"
@@ -34,13 +37,19 @@
     (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 dmz1 "217.169.12.64/28")
+(defnet distorted.org.uk-aaisp "2001:8b0:c92/48"
+  (unsafe "1/64"
+    (dhcp "6468:6370/96"))
+  (nany "0/64")
+  (dmz "fff/64")
+  (safe "4001/64")
+  (nvpn "6000/64")
+  (untrusted "8001/64")
+  (nupn "a000/64"))
 
 ;; Externally routed colo range.
 (defnet jump "212.13.198.66/28")
@@ -51,40 +60,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))
@@ -92,11 +82,21 @@
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
-(defhost jaguar.jump ((:ipv4 jump 11) (:ipv6 jump "::2:1")))
+(defhost marshall.jump ((:ipv4 jump 11) (:ipv6 jump "::2:1")))
 (defhost richmond.jump ((:ipv4 jump 12) (:ipv6 jump "::1:1")))
 (defhost anon.jump (jump 13))
 (defhost blackhole.jump ((:ipv4 jump 14) (:ipv6 jump "::ffff")))
 
+;; Formerly colocated addresses.
+(defhost precision.dmz ((:ipv4 dmz1 1) (:ipv6 dmz 33)))
+(defhost telecaster.dmz ((:ipv4 dmz1 2) (:ipv6 dmz 34)))
+(defhost stratocaster.dmz ((:ipv4 dmz1 3) (:ipv6 dmz 35)))
+(defhost jazz.dmz ((:ipv4 dmz1 4) (:ipv6 dmz 36)))
+(defhost fender.dmz ((:ipv4 dmz1 9) (:ipv6 dmz 41)))
+(defhost marshall.dmz ((:ipv4 dmz1 11) (:ipv6 dmz "::2:1")))
+(defhost richmond.dmz ((:ipv4 dmz1 12) (:ipv6 dmz "::1:1")))
+(defhost blackhole.dmz ((:ipv4 dmz1 14) (:ipv6 dmz "::ffff")))
+
 ;; Linode virtual hosts.
 (defhost national.linode ((:ipv4 "45.33.118.239")
 			  (:ipv6 "2600:3c00::f03c:91ff:fe3b:d7c1")))
@@ -108,17 +108,23 @@
 (defhost artist.unsafe (unsafe 4))
 (defhost vampire.unsafe (unsafe 5))
 (defhost universe.unsafe (unsafe 6))
+(defhost precision.unsafe (unsafe 7))
+(defhost telecaster.unsafe (unsafe 8))
+(defhost stratocaster.unsafe (unsafe 9))
+(defhost jazz.unsafe (unsafe 10))
 (defhost ibanez.unsafe (unsafe 14))
+(defhost fender.unsafe (unsafe 15))
 (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")))
+(defhost spirit.unsafe ((:ipv6 unsafe "568d:5aff:fed9:18b8")))
 
 ;; Safe network.
 (defhost radius.safe (safe 1))
@@ -127,11 +133,15 @@
 (defhost grigsby.safe (safe 4))
 (defhost carling.safe (safe 5))
 (defhost tritan.safe (safe 6))
+(defhost kitkat.safe (safe 7))
+(defhost lunch.safe (safe 8))
+(defhost burntaxe.safe (safe 9))
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))
 (defhost artist.untrusted (untrusted 2))
 (defhost vampire.untrusted (untrusted 3))
+(defhost jazz.untrusted (untrusted 4))
 
 ;; Virtual private network.
 (defhost crybaby.vpn ((:ipv4 vpn 1) (:ipv6 vpn "::1:1")))
@@ -142,13 +152,34 @@
 (defhost precision.vpn ((:ipv4 vpn 6) (:ipv6 vpn "::6:1")))
 (defhost jazz.vpn ((:ipv4 vpn 7) (:ipv6 vpn "::7:1")))
 (defhost vampire.vpn ((:ipv4 vpn 8) (:ipv6 vpn "::8:1")))
+(defhost spirit.vpn ((:ipv4 vpn 9) (:ipv6 vpn "::9:1")))
+(defhost groove.vpn ((:ipv4 vpn 10) (:ipv6 vpn "::10:1")))
+
+(defhost crybaby.nvpn ((:ipv6 nvpn "::1:1")))
+(defhost orange.nvpn ((:ipv6 nvpn "::3:1")))
+(defhost haze.nvpn ((:ipv6 nvpn "::4:1")))
+(defhost radius.nvpn ((:ipv6 nvpn "::5:1")))
+(defhost precision.nvpn ((:ipv6 nvpn "::6:1")))
+(defhost jazz.nvpn ((:ipv6 nvpn "::7:1")))
+(defhost vampire.nvpn ((:ipv6 nvpn "::8:1")))
+(defhost spirit.nvpn ((:ipv6 nvpn "::9:1")))
+(defhost groove.nvpn ((:ipv6 nvpn "::10:1")))
 
 ;; Untrusted private network.
 (defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
+(defhost mdwdev.upn ((:ipv4 upn 2) (:ipv6 upn "::2:1")))
+
+(defhost national.nupn ((:ipv6 nupn "::1:1")))
+(defhost mdwdev.nupn ((:ipv6 nupn "::2:1")))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
 
+;; Hippotat network.
+(defhost jazz.hippo (hippo 1))
+(defhost crybaby.hippo (hippo 2))
+(defhost spirit.hippo (hippo 3))
+
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.
 (defhost gw.its (its 1))
@@ -170,23 +201,34 @@
 (defhost krb0.any ((:ipv4 any 5) (:ipv6 any "::5:1")))
 (defhost krb1.any ((:ipv4 any 6) (:ipv6 any "::6:1")))
 
+(defhost dns0.nany ((:ipv6 nany "::0:1")))
+(defhost dns1.nany ((:ipv6 nany "::1:1")))
+(defhost ntp0.nany ((:ipv6 nany "::2:1")))
+(defhost ntp1.nany ((:ipv6 nany "::3:1")))
+(defhost www-cache.nany ((:ipv6 nany "::4:1")))
+(defhost krb0.nany ((:ipv6 nany "::5:1")))
+(defhost krb1.nany ((:ipv6 nany "::6:1")))
+
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.
 
 (preferred-subnet-case
   ((unsafe colo)
    (defhost radius radius.unsafe)
+   (defhost vampire vampire.unsafe)
    (defhost precision precision.colo)
    (defhost telecaster telecaster.colo)
    (defhost stratocaster stratocaster.colo)
-   (defhost vampire vampire.unsafe))
+   (defhost national national.upn))
   (t
    (defhost radius radius.dmz)
+   (defhost vampire vampire.dmz)
    (defhost precision precision.jump)
    (defhost telecaster telecaster.jump)
    (defhost stratocaster stratocaster.jump)
-   (defhost vampire vampire.dmz)))
+   (defhost national national.linode)))
 
-(defhost jaguar jaguar.jump)
+(defhost marshall marshall.jump)
+(defhost mdwdev mdwdev.upn)
 
 ;;;----- That's all, folks --------------------------------------------------