X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/cacadc0b96cd058d9ffb4f226649bf2c80a1ef26..f48e30835b724979f22fc04d79c38c9931cdf891:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 062d685..b1a7fa6 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -71,6 +71,7 @@ (defzone distorted.org.uk
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
+       #+deploy-eggle (eggle.ns :ip eggle)
        #-view/inside (mythic-beasts-1.ns :ip mythic-ns1)
        #-view/inside (mythic-beasts-2.ns :ip mythic-ns2)
        #-view/inside (mythic-beasts-3.ns :ip mythic-ns3)
@@ -212,6 +213,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.
@@ -321,7 +324,8 @@ (defzone distorted.org.uk
   (dhcp :ns ((radius.ns.dhcp :ip radius)
 	     (precision.ns.dhcp :ip precision)
 	     (telecaster.ns.dhcp :ip telecaster)
-	     (national.ns.dhcp :ip national))
+	     (national.ns.dhcp :ip national)
+	     #+deploy-eggle (eggle.ns.dhcp :ip eggle))
 	:ds ((55966 :rsasha256 :sha1
 	     "95b05c1f4e84f950f29630004bac447f8a87ca33")
 	     (55966 :rsasha256 :sha256
@@ -330,7 +334,8 @@ (defzone distorted.org.uk
   (dyn :ns ((radius.ns.dyn :ip radius)
 	    (precision.ns.dyn :ip precision)
 	    (telecaster.ns.dyn :ip telecaster)
-	    (national.ns.dyn :ip national))
+	    (national.ns.dyn :ip national)
+	    #+deploy-eggle (eggle.ns.dyn :ip eggle))
        :ds ((11335 :rsasha256 :sha1
 	    "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
 	    (11335 :rsasha256 :sha256
@@ -339,7 +344,8 @@ (defzone distorted.org.uk
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
 	       (precision.ns.dnserr :ip precision.dmz)
 	       (telecaster.ns.dnserr :ip telecaster.dmz)
-	       (national.ns.dnserr :ip national.linode))
+	       (national.ns.dnserr :ip national.linode)
+	       #+deploy-eggle (eggle.ns.dnserr :ip eggle.jump))
 	  :ds ((40945 :rsasha256 :sha1
 		"f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
 	       (40945 :rsasha256 :sha256
@@ -350,6 +356,7 @@ (defzone distorted.org.uk
 	(precision.ns.stratocaster.dkim :ip precision.dmz)
 	(telecaster.ns.stratocaster.dkim :ip telecaster.dmz)
 	(national.ns.stratocaster.dkim :ip national.linode)
+	#+deploy-eggle (eggle.ns :ip eggle.jump)
 	(mythic-beasts-1.ns.stratocaster.dkim :ip mythic-ns1)
 	(mythic-beasts-2.ns.stratocaster.dkim :ip mythic-ns2)
 	(mythic-beasts-3.ns.stratocaster.dkim :ip mythic-ns3))
@@ -363,6 +370,7 @@ (defzone distorted.org.uk
 	(precision.ns.telecaster.dkim :ip precision.dmz)
 	(telecaster.ns.telecaster.dkim :ip telecaster.dmz)
 	(national.ns.telecaster.dkim :ip national.linode)
+	#+deploy-eggle (eggle.ns :ip eggle.jump)
 	(mythic-beasts-1.ns.telecaster.dkim :ip mythic-ns1)
 	(mythic-beasts-2.ns.telecaster.dkim :ip mythic-ns2)
 	(mythic-beasts-3.ns.telecaster.dkim :ip mythic-ns3))
@@ -372,7 +380,7 @@ (defzone distorted.org.uk
 	 #.(concatenate 'string "66997571c7d47f912caa65f2154ecd37"
 				"5b9d391e3ed44d79ac35eef59264e521"))))
   (io :ns ((ns.io :ip jazz.dmz)))
-  (play :ns (radius.ns precision.ns telecaster.ns national.ns)))
+  (play :ns (radius.ns precision.ns telecaster.ns national.ns #+deploy-eggle eggle.jump)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
@@ -382,7 +390,8 @@ (defzone dhcp.distorted.org.uk
   :ns ((radius.ns :ip radius)
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
-       (national.ns :ip national))
+       (national.ns :ip national)
+       #+deploy-eggle (eggle.ns.dhcp :ip eggle))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
@@ -397,7 +406,8 @@ (defzone (dyn.distorted.org.uk :source telecaster.distorted.org.uk.)
   :ns ((radius.ns :ip radius)
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
-       (national.ns :ip national)))
+       (national.ns :ip national)
+       #+deploy-eggle (eggle.ns.dhcp :ip eggle)))
 
 #+view/outside
 (defzone nicko.org
@@ -409,6 +419,7 @@ (defzone stratocaster.dkim.distorted.org.uk
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
+       #+deploy-eggle (eggle.ns.dhcp :ip eggle)
        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2)
        (mythic-beasts-3.ns :ip mythic-ns3)))
@@ -418,6 +429,7 @@ (defzone telecaster.dkim.distorted.org.uk
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
+       #+deploy-eggle (eggle.ns.dhcp :ip eggle)
        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2)
        (mythic-beasts-3.ns :ip mythic-ns3)))
@@ -426,7 +438,8 @@ (defrevzone trusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.)
+       national.distorted.org.uk.
+       #+deploy-eggle eggle.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
   :reverse its
@@ -442,19 +455,22 @@ (defzone dhcp.199.29.172.in-addr.arpa
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.))
+       national.distorted.org.uk.
+       #+deploy-eggle eggle.distorted.org.uk.))
 
 (defrevzone untrusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.))
+       national.distorted.org.uk.
+       #+deploy-eggle eggle.distorted.org.uk.))
 
 (defzone 128-143.238.187.81.in-addr.arpa
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
+       #+deploy-eggle eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 dmz)))))
 
@@ -463,6 +479,7 @@ (defzone 64-79.12.169.217.in-addr.arpa
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
+       #+deploy-eggle eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 dmz1)))))
 
@@ -471,6 +488,7 @@ (defzone 195.113.2.81.in-addr.arpa
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
+       #+deploy-eggle eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 gw)))))
 
@@ -479,18 +497,29 @@ (defrevzone (distorted.org.uk-aaisp :family :ipv6)
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
+       #+deploy-eggle eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   (0.7.3.6.8.6.4.6.1.0.0.0 :ns (radius.distorted.org.uk.
 				precision.distorted.org.uk.
 				telecaster.distorted.org.uk.
-				national.distorted.org.uk.))
+				national.distorted.org.uk.
+				#+deploy-eggle eggle.distorted.org.uk.))
   :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
 
+(defrevzone jump-ipv6
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       national.distorted.org.uk.
+       #+deploy-eggle eggle.distorted.org.uk.)
+  :reverse ((((:ipv6 jump-ipv6)))))
+
 (defrevzone (dhcp :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.))
+       national.distorted.org.uk.
+       #+deploy-eggle eggle.distorted.org.uk.))
 
 #+view/outside
 (defzone io.distorted.org.uk