X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/1a8dfbe2f3ee79f020e765f7c41aef9ee0074604..25d23a912d425363732c9cba37bc54235511412a:/hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 7afcd28..8e308b1 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"
@@ -38,7 +41,8 @@
 (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")
+  (unsafe "1/64"
+    (dhcp "6468:6370/96"))
   (dmz "fff/64")
   (safe "4001/64")
   (untrusted "8001/64"))
@@ -74,7 +78,7 @@
 (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")))
@@ -101,6 +105,7 @@
 (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))
@@ -109,6 +114,9 @@
 (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))
@@ -124,13 +132,20 @@
 (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")))
 
 ;; Untrusted private network.
 (defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
+(defhost mdwdev.upn ((:ipv4 upn 2) (:ipv6 upn "::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))
@@ -171,6 +186,7 @@
    (defhost stratocaster stratocaster.jump)
    (defhost national national.linode)))
 
-(defhost jaguar jaguar.jump)
+(defhost marshall marshall.jump)
+(defhost mdwdev mdwdev.upn)
 
 ;;;----- That's all, folks --------------------------------------------------