X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/2af6f6bd78893d7a2f4d4f5909c73c832702597d..bda4d30e98bbdd8a499c9d2faa31e7e61de6c00f:/hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 6731813..79c07e5 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -40,12 +40,16 @@ (defnet distorted.org.uk "172.29.198/23"
 ;; Externally routable DMZ from Andrews and Arnold.
 (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")
-  (untrusted "8001/64"))
+  (nvpn "6000/64")
+  (untrusted "8001/64")
+  (nupn "a000/64"))
 
 ;; Externally routed colo range.
 (defnet jump "212.13.198.66/28")
@@ -83,6 +87,16 @@ (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")))
@@ -94,7 +108,12 @@ (defhost jem.unsafe (unsafe 3))
 (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.
@@ -122,6 +141,7 @@ (defhost burntaxe.safe (safe 9))
 (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")))
@@ -135,10 +155,23 @@ (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))
 
@@ -168,6 +201,14 @@ (defhost www-cache.any ((:ipv4 any 4) (:ipv6 any "::4:1")))
 (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.