From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 25 May 2024 00:10:03 +0000 (+0100)
Subject: *.lisp: Deploy `eggle' as a nameserver.
X-Git-Url: https://git.distorted.org.uk/~mdw/zones/commitdiff_plain/refs/heads/master?ds=sidebyside

*.lisp: Deploy `eggle' as a nameserver.
---

diff --git a/binswood.lisp b/binswood.lisp
index bced2a5..12342ff 100644
--- a/binswood.lisp
+++ b/binswood.lisp
@@ -17,7 +17,7 @@
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+deploy-eggle (eggle.ns :ip eggle)
+       (eggle.ns :ip eggle)
        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2)
        (mythic-beasts-3.ns :ip mythic-ns3))
@@ -38,7 +38,7 @@
 	    (precision.ns.dyn :ip precision)
 	    (telecaster.ns.dyn :ip telecaster)
 	    (national.ns.dyn :ip national)
-	    #+deploy-eggle (eggle.ns.dyn :ip eggle)))
+	    (eggle.ns.dyn :ip eggle)))
   (ext :cname ext.dyn))
 
 (defzone (dyn.binswood.org.uk :source telecaster.distorted.org.uk.)
@@ -46,7 +46,7 @@
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+deploy-eggle (eggle.ns :ip eggle)))
+       (eggle.ns :ip eggle)))
 
 (defrevzone binswood
   :ns ((radius.ns :ip radius)
diff --git a/distorted.lisp b/distorted.lisp
index b1a7fa6..190c54e 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -71,7 +71,7 @@
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+deploy-eggle (eggle.ns :ip 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)
@@ -325,7 +325,7 @@
 	     (precision.ns.dhcp :ip precision)
 	     (telecaster.ns.dhcp :ip telecaster)
 	     (national.ns.dhcp :ip national)
-	     #+deploy-eggle (eggle.ns.dhcp :ip eggle))
+	     (eggle.ns.dhcp :ip eggle))
 	:ds ((55966 :rsasha256 :sha1
 	     "95b05c1f4e84f950f29630004bac447f8a87ca33")
 	     (55966 :rsasha256 :sha256
@@ -335,7 +335,7 @@
 	    (precision.ns.dyn :ip precision)
 	    (telecaster.ns.dyn :ip telecaster)
 	    (national.ns.dyn :ip national)
-	    #+deploy-eggle (eggle.ns.dyn :ip eggle))
+	    (eggle.ns.dyn :ip eggle))
        :ds ((11335 :rsasha256 :sha1
 	    "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
 	    (11335 :rsasha256 :sha256
@@ -345,7 +345,7 @@
 	       (precision.ns.dnserr :ip precision.dmz)
 	       (telecaster.ns.dnserr :ip telecaster.dmz)
 	       (national.ns.dnserr :ip national.linode)
-	       #+deploy-eggle (eggle.ns.dnserr :ip eggle.jump))
+	       (eggle.ns.dnserr :ip eggle.jump))
 	  :ds ((40945 :rsasha256 :sha1
 		"f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
 	       (40945 :rsasha256 :sha256
@@ -356,7 +356,7 @@
 	(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)
+	(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))
@@ -370,7 +370,7 @@
 	(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)
+	(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))
@@ -380,7 +380,7 @@
 	 #.(concatenate 'string "66997571c7d47f912caa65f2154ecd37"
 				"5b9d391e3ed44d79ac35eef59264e521"))))
   (io :ns ((ns.io :ip jazz.dmz)))
-  (play :ns (radius.ns precision.ns telecaster.ns national.ns #+deploy-eggle eggle.jump)))
+  (play :ns (radius.ns precision.ns telecaster.ns national.ns eggle.jump)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
@@ -391,7 +391,7 @@
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+deploy-eggle (eggle.ns.dhcp :ip eggle))
+       (eggle.ns.dhcp :ip eggle))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
@@ -407,7 +407,7 @@
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+deploy-eggle (eggle.ns.dhcp :ip eggle)))
+       (eggle.ns.dhcp :ip eggle)))
 
 #+view/outside
 (defzone nicko.org
@@ -419,7 +419,7 @@
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+deploy-eggle (eggle.ns.dhcp :ip 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)))
@@ -429,7 +429,7 @@
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+deploy-eggle (eggle.ns.dhcp :ip 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)))
@@ -439,7 +439,7 @@
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
-       #+deploy-eggle eggle.distorted.org.uk.)
+       eggle.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
   :reverse its
@@ -456,21 +456,21 @@
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
-       #+deploy-eggle eggle.distorted.org.uk.))
+       eggle.distorted.org.uk.))
 
 (defrevzone untrusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
-       #+deploy-eggle eggle.distorted.org.uk.))
+       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.
+       eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 dmz)))))
 
@@ -479,7 +479,7 @@
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
-       #+deploy-eggle eggle.distorted.org.uk.
+       eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 dmz1)))))
 
@@ -488,7 +488,7 @@
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
-       #+deploy-eggle eggle.distorted.org.uk.
+       eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 gw)))))
 
@@ -497,13 +497,13 @@
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
-       #+deploy-eggle eggle.distorted.org.uk.
+       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.
-				#+deploy-eggle eggle.distorted.org.uk.))
+				eggle.distorted.org.uk.))
   :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
 
 (defrevzone jump-ipv6
@@ -511,7 +511,7 @@
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
-       #+deploy-eggle eggle.distorted.org.uk.)
+       eggle.distorted.org.uk.)
   :reverse ((((:ipv6 jump-ipv6)))))
 
 (defrevzone (dhcp :family :ipv6)
@@ -519,7 +519,7 @@
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
-       #+deploy-eggle eggle.distorted.org.uk.))
+       eggle.distorted.org.uk.))
 
 #+view/outside
 (defzone io.distorted.org.uk
diff --git a/escorted.lisp b/escorted.lisp
index e63a281..99641bf 100644
--- a/escorted.lisp
+++ b/escorted.lisp
@@ -13,7 +13,7 @@
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+deploy-eggle (eggle.ns :ip eggle)
+       (eggle.ns :ip eggle)
        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2)
        (mythic-beasts-3.ns :ip mythic-ns3))
diff --git a/odin.lisp b/odin.lisp
index 614dc93..fc921ca 100644
--- a/odin.lisp
+++ b/odin.lisp
@@ -13,7 +13,7 @@
        (precision-ns :ip precision)
        (telecaster-ns :ip telecaster)
        (national-ns :ip national)
-       #+deploy-eggle (eggle-ns :ip eggle))
+       (eggle-ns :ip eggle))
 
   ;; Web service.
   ((@ www) :svc stratocaster