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

This is for Ian Jackson's `Asinine IP Over HTTP' utility.

diff --git a/distorted.lisp b/distorted.lisp
index e17768b..a2b9a4f 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -183,6 +183,7 @@
 
   ;; Fancy connectivity.
   (iodine (jump :svc jazz.jump))
 
   ;; Fancy connectivity.
   (iodine (jump :svc jazz.jump))

+  (hippotat (jump :svc jazz.jump))

 
   ;; Colocated hosts.
   (colo :net colo)
 
   ;; Colocated hosts.
   (colo :net colo)


@@ -209,7 +210,8 @@
   (jazz (colo :addr jazz.colo :sshfp "jazz")
        (jump :addr jazz.jump :sshfp "jazz")
        (vpn :addr jazz.vpn :sshfp "jazz")
   (jazz (colo :addr jazz.colo :sshfp "jazz")
        (jump :addr jazz.jump :sshfp "jazz")
        (vpn :addr jazz.vpn :sshfp "jazz")

-       (iodine :addr jazz.iodine :sshfp "jazz"))
+       (iodine :addr jazz.iodine :sshfp "jazz")
+       (hippo :addr jazz.hippo :sshfp "jazz"))

 
   ;; Virtual hosts.
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))
 
   ;; Virtual hosts.
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))


@@ -292,13 +294,15 @@
   ;; Virtual network.
   (vpn :net vpn)
   (crybaby :abbrev cb)
   ;; Virtual network.
   (vpn :net vpn)
   (crybaby :abbrev cb)

-  (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby"))
+  (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby")
+          (hippo :addr crybaby.hippo :sshfp "crybaby"))

   (terror (vpn :addr terror.vpn :sshfp "terror"))
   (orange :abbrev o)
   (orange (vpn :addr orange.vpn :sshfp "orange"))
   (haze :abbrev h)
   (haze (vpn :addr haze.vpn :sshfp "haze"))
   (iodine :net iodine)
   (terror (vpn :addr terror.vpn :sshfp "terror"))
   (orange :abbrev o)
   (orange (vpn :addr orange.vpn :sshfp "orange"))
   (haze :abbrev h)
   (haze (vpn :addr haze.vpn :sshfp "haze"))
   (iodine :net iodine)

+  (hippo :net hippo)

 
   ;; ITS.
   (its :net its)
 
   ;; ITS.
   (its :net its)

diff --git a/hosts.lisp b/hosts.lisp
index 25e151e..546258f 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -25,6 +25,7 @@
   (untrusted "198.0/24"
     (wireless "0/25")
     (iodine "128/28")
   (untrusted "198.0/24"
     (wireless "0/25")
     (iodine "128/28")

+    (hippo "144/28")

     (upn "160/27"))
   (trusted "199.0/24"
     (wired "0/25"
     (upn "160/27"))
   (trusted "199.0/24"
     (wired "0/25"


@@ -134,6 +135,10 @@
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
 
 ;; 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))
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.
 (defhost gw.its (its 1))