hosts.lisp, distorted.lisp: Define a network for `hippotat'.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 34c3a88..546258f 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -9,10 +9,12 @@
 (defhost chiark.greenend.org.uk ((:ipv4 "212.13.197.229")
                                 (:ipv6 "2001:ba8:1e3::")))
 (defhost mccoy.flatline.org.uk "80.74.241.31")
-(defhost mythic-ns1 ((:ipv4 "69.56.173.190")
+(defhost mythic-ns1 ((:ipv4 "45.33.127.156")
                     (:ipv6 "2600:3c00::f03c:91ff:fe96:beac")))
 (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"))
@@ -131,6 +135,10 @@
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
 
+;; Hippotat network.
+(defhost jazz.hippo (hippo 1))
+(defhost crybaby.hippo (hippo 2))
+
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.
 (defhost gw.its (its 1))
@@ -161,13 +169,15 @@
    (defhost vampire vampire.unsafe)
    (defhost precision precision.colo)
    (defhost telecaster telecaster.colo)
-   (defhost stratocaster stratocaster.colo))
+   (defhost stratocaster stratocaster.colo)
+   (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 stratocaster stratocaster.jump)
+   (defhost national national.linode)))
 
 (defhost jaguar jaguar.jump)