distorted.lisp, hosts.lisp: Add address for new VPS `eggle'.

diff --git a/distorted.lisp b/distorted.lisp
index 062d685cc075654abaa9e86f94cfde3a0344bd74..cac864b0a538f4f3527e726014c1253da6377359 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -212,6 +212,8 @@ (defzone distorted.org.uk
   ;; Virtual hosts.
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))
   (national (linode :addr national.linode) (upn :addr national.upn))
+  (eggle :abbrev e (jump :abbrev ej) (upn :abbrev ey))
+  (eggle (jump :addr eggle.jump) (upn :addr eggle.upn))
   (mdwdev (upn :addr mdwdev.upn))
 
   ;; Nicko's servers.

diff --git a/hosts.lisp b/hosts.lisp
index 66c3f46483d90481670d576d6cf45d5c6d3bdded..1c20715755d0fb5d53b93d62ffbf1d1e7d6e98bd 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -50,6 +50,8 @@ (defnet distorted.org.uk-aaisp "2001:8b0:c92/48"
   (untrusted "8001/64")
   (upn "a000/64"))
 
+(defnet jump-ipv6 "2001:b8a:1d9/48")
+
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
 
@@ -75,6 +77,10 @@ (defhost marshall.dmz ((:ipv4 dmz1 11) (:ipv6 dmz "::2:1")))
 (defhost richmond.dmz ((:ipv4 dmz1 12) (:ipv6 dmz "::1:1")))
 (defhost blackhole.dmz ((:ipv4 dmz1 14) (:ipv6 dmz "::ffff")))
 
+;; Jump virtual hosts.
+(defhost eggle.jump ((:ipv4 "185.73.44.143")
+                    (:ipv6 jump-ipv6 "8002::1")))
+
 ;; Linode virtual hosts.
 (defhost national.linode ((:ipv4 "45.33.118.239")
                          (:ipv6 "2600:3c00::f03c:91ff:fe3b:d7c1")))
@@ -136,6 +142,7 @@ (defhost groove.vpn ((:ipv4 vpn 10) (:ipv6 vpn "::10:1")))
 ;; Untrusted private network.
 (defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
 (defhost mdwdev.upn ((:ipv4 upn 2) (:ipv6 upn "::2:1")))
+(defhost eggle.upn ((:ipv4 upn 3) (:ipv6 upn "::3:1")))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
@@ -169,14 +176,16 @@    (defhost vampire vampire.unsafe)
    (defhost precision precision.unsafe)
    (defhost telecaster telecaster.unsafe)
    (defhost stratocaster stratocaster.unsafe)
-   (defhost national national.upn))
+   (defhost national national.upn)
+   (defhost eggle eggle.upn))
   (t
    (defhost radius radius.dmz)
    (defhost vampire vampire.dmz)
    (defhost precision precision.dmz)
    (defhost telecaster telecaster.dmz)
    (defhost stratocaster stratocaster.dmz)
-   (defhost national national.linode)))
+   (defhost national national.linode)
+   (defhost eggle eggle.jump)))
 
 (defhost marshall marshall.dmz)
 (defhost mdwdev mdwdev.upn)