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

diff --git a/binswood.lisp b/binswood.lisp
index bced2a507168083289821f1c97b01b9039e37a53..12342ffcb4f307d0376d68aa0585b0f14d7f667e 100644 (file)
--- a/binswood.lisp
+++ b/binswood.lisp
@@ -17,7 +17,7 @@ (defzone binswood.org.uk
        (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 @@ (defzone binswood.org.uk
            (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 @@ (defzone (dyn.binswood.org.uk :source telecaster.distorted.org.uk.)
        (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 b1a7fa6b1b12afad925215d405763d993c4ee527..190c54e1f5e25e2d3cbbe2c9899b430587262cc1 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -71,7 +71,7 @@ (defzone distorted.org.uk
        (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 @@ (defzone distorted.org.uk
             (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 @@ (defzone distorted.org.uk
            (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 @@ (defzone distorted.org.uk
               (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 @@ (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)
+       (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 @@ (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)
+       (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 @@ (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 #+deploy-eggle eggle.jump)))
+  (play :ns (radius.ns precision.ns telecaster.ns national.ns eggle.jump)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
@@ -391,7 +391,7 @@ (defzone dhcp.distorted.org.uk
        (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 @@ (defzone (dyn.distorted.org.uk :source telecaster.distorted.org.uk.)
        (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 @@ (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)
+       (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 @@ (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)
+       (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 @@ (defrevzone trusted
        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 @@ (defzone dhcp.199.29.172.in-addr.arpa
        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 @@ (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.
+       eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 dmz1)))))
 
@@ -488,7 +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.
+       eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 gw)))))
 
@@ -497,13 +497,13 @@ (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.
+       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 @@ (defrevzone jump-ipv6
        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 @@ (defrevzone (dhcp :family :ipv6)
        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 e63a2819da1498593954f039b3e85f5e8aaaa6f3..99641bf48a630299358bbaf82b30038f243ab820 100644 (file)
--- a/escorted.lisp
+++ b/escorted.lisp
@@ -13,7 +13,7 @@ (defzone escorted.org.uk
        (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 614dc932222c6ab9fd1b42b73620fb5ccaf61766..fc921ca007c87f5fa15536557b6223fcd51ce104 100644 (file)
--- a/odin.lisp
+++ b/odin.lisp
@@ -13,7 +13,7 @@ (defzone odin.gg
        (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