#+chiark-dns-ipv6 (:ipv6 "2001:ba8:1e3::")))
(defhost mccoy.flatline.org.uk "80.74.241.31")
(defhost mythic-ns1 ((:ipv4 "45.33.127.156")
- (:ipv6 "2600:3c00::f03c:91ff:fe96:beac")))
+ (: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")
;; 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")
(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")))
(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 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")))
(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))
(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.
(defhost stratocaster stratocaster.jump)
(defhost national national.linode)))
-(defhost jaguar jaguar.jump)
+(defhost marshall marshall.jump)
+(defhost mdwdev mdwdev.upn)
;;;----- That's all, folks --------------------------------------------------