distorted.lisp, hosts.lisp: New laptop `spirit'.

diff --git a/distorted.lisp b/distorted.lisp
index a03fa046ef3dee6f46b4efaaefb1d440ea3618bd..ec828719c6f4b1d591d4400837f613fedf2fd565 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -308,6 +308,8 @@ (defzone distorted.org.uk
   (crybaby :abbrev cb)
   (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby")
           (hippo :addr crybaby.hippo :sshfp "crybaby"))
+  (spirit (vpn :addr spirit.vpn :sshfp "spirit")
+         (hippo :addr spirit.hippo :sshfp "spirit"))
   (terror (vpn :addr terror.vpn :sshfp "terror"))
   (orange :abbrev o)
   (orange (vpn :addr orange.vpn :sshfp "orange"))
@@ -370,6 +372,7 @@ (defzone dhcp.distorted.org.uk
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
   (gretsch :addr gretsch.unsafe)
+  (spirit :addr spirit.unsafe)
   (haze :addr haze.unsafe)
   (invader :addr invader.safe)
   (marauder :addr marauder.safe))

diff --git a/hosts.lisp b/hosts.lisp
index bbe1663dcd067c0bf16ebbef11db6d498cae6b8f..3aabfd21ef8e582a738b402b05b452cbe1004638 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -105,6 +105,7 @@ (defhost haze.unsafe ((:ipv6 unsafe "5056:a8ff:fe01:5654")))
 (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))
@@ -128,6 +129,7 @@ (defhost radius.vpn ((:ipv4 vpn 5) (:ipv6 vpn "::5:1")))
 (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")))
@@ -138,6 +140,7 @@ (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.

diff --git a/keys/spirit.sshfp b/keys/spirit.sshfp
new file mode 100644 (file)
index 0000000..68c4759
--- /dev/null
+++ b/keys/spirit.sshfp
@@ -0,0 +1,6 @@
+spirit.distorted.org.uk IN SSHFP 1 1 82f79f01af802b83e73436a8d040510b63aa326e
+spirit.distorted.org.uk IN SSHFP 1 2 bb02d955788b01527a7c1929bd94d37db58d2658a243feab694ae526b2067346
+spirit.distorted.org.uk IN SSHFP 3 1 0d0726b919b2946a905453b7a1a67267e9edc474
+spirit.distorted.org.uk IN SSHFP 3 2 96ef925d05409ff59926f6f0bf563da50fe0d8e073a2a398250db63bcdb99f12
+spirit.distorted.org.uk IN SSHFP 4 1 7b5eda594abfb1c923d84d9b758fc15f459e3a53
+spirit.distorted.org.uk IN SSHFP 4 2 825936f5dbbb83b91acc4d31bf01083bc9d3e649bf85e6b04ba56bd8c946d99c