From df1d9fe18df7ab9e1b130515ad38c0f8b06c912d Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sun, 1 Oct 2017 15:40:31 +0100 Subject: [PATCH] hosts.lisp, distorted.lisp: Define a network for `hippotat'. This is for Ian Jackson's `Asinine IP Over HTTP' utility. --- distorted.lisp | 8 ++++++-- hosts.lisp | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/distorted.lisp b/distorted.lisp index e17768b..a2b9a4f 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -183,6 +183,7 @@ ;; Fancy connectivity. (iodine (jump :svc jazz.jump)) + (hippotat (jump :svc jazz.jump)) ;; 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") - (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)) @@ -292,13 +294,15 @@ ;; 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) + (hippo :net hippo) ;; ITS. (its :net its) diff --git a/hosts.lisp b/hosts.lisp index 25e151e..546258f 100644 --- a/hosts.lisp +++ b/hosts.lisp @@ -25,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" @@ -134,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)) -- 2.11.0