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

diff --git a/distorted.lisp b/distorted.lisp
index 062d685..cac864b 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -212,6 +212,8 @@
   ;; Virtual hosts.
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))
   (national (linode :addr national.linode) (upn :addr national.upn))
   ;; 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.
   (mdwdev (upn :addr mdwdev.upn))
 
   ;; Nicko's servers.

diff --git a/hosts.lisp b/hosts.lisp
index 66c3f46..1c20715 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -50,6 +50,8 @@
   (untrusted "8001/64")
   (upn "a000/64"))
 
   (untrusted "8001/64")
   (upn "a000/64"))
 

+(defnet jump-ipv6 "2001:b8a:1d9/48")
+

 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
 
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
 


@@ -75,6 +77,10 @@
 (defhost richmond.dmz ((:ipv4 dmz1 12) (:ipv6 dmz "::1:1")))
 (defhost blackhole.dmz ((:ipv4 dmz1 14) (:ipv6 dmz "::ffff")))
 
 (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")))
 ;; Linode virtual hosts.
 (defhost national.linode ((:ipv4 "45.33.118.239")
                          (:ipv6 "2600:3c00::f03c:91ff:fe3b:d7c1")))


@@ -136,6 +142,7 @@
 ;; Untrusted private network.
 (defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
 (defhost mdwdev.upn ((:ipv4 upn 2) (:ipv6 upn "::2: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))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))


@@ -169,14 +176,16 @@
    (defhost precision precision.unsafe)
    (defhost telecaster telecaster.unsafe)
    (defhost stratocaster stratocaster.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)
   (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)
 
 (defhost marshall marshall.dmz)
 (defhost mdwdev mdwdev.upn)