X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/be5a78bf69376e5423909a568e805c18cbacb66e..5b39cda9b45e01eaba13b8eb6cf4c3e1f4c81a25:/distorted.lisp?ds=sidebyside

diff --git a/distorted.lisp b/distorted.lisp
index dd52e09..3798725 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -71,7 +71,6 @@ (defzone distorted.org.uk
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+view/inside (vampire.ns :ip vampire)
        #-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)
@@ -314,7 +313,6 @@ (defzone distorted.org.uk
 
   ;; Delegations.
   (dhcp :ns ((radius.ns.dhcp :ip radius)
-	     (vampire.ns.dhcp :ip vampire)
 	     (precision.ns.dhcp :ip precision)
 	     (telecaster.ns.dhcp :ip telecaster)
 	     (national.ns.dhcp :ip national))
@@ -324,7 +322,6 @@ (defzone distorted.org.uk
 	      #.(concatenate 'string "31696bf54b577362b2eb75793adeb9ec"
 				     "2e8440ec671371b35d8d978cd9ca3007"))))
   (dyn :ns ((radius.ns.dyn :ip radius)
-	    (vampire.ns.dyn :ip vampire)
 	    (precision.ns.dyn :ip precision)
 	    (telecaster.ns.dyn :ip telecaster)
 	    (national.ns.dyn :ip national))
@@ -342,7 +339,8 @@ (defzone distorted.org.uk
 	       (40945 :rsasha256 :sha256
 		#.(concatenate 'string "fb171d206d4d64c5a7a6c290ce6e20df"
 				       "44f1db7f41e2260f1fe8d7c55d524c11"))))
-  (io :ns ((ns.io :ip jazz.dmz))))
+  (io :ns ((ns.io :ip jazz.dmz)))
+  (play :ns (radius.ns precision.ns telecaster.ns national.ns)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
@@ -361,9 +359,8 @@ (defzone dhcp.distorted.org.uk
   (invader :addr invader.safe)
   (marauder :addr marauder.safe))
 
-(defzone dyn.distorted.org.uk
+(defzone (dyn.distorted.org.uk :source telecaster.distorted.org.uk.)
   :ns ((radius.ns :ip radius)
-       (vampire.ns :ip vampire)
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)))
@@ -373,7 +370,6 @@ (defzone nicko.org
 
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.)
@@ -382,7 +378,6 @@ (defrevzone trusted
   :reverse its
   :reverse any
   (dhcp :ns (radius.distorted.org.uk.
-	     vampire.distorted.org.uk.
 	     precision.distorted.org.uk.
 	     telecaster.distorted.org.uk.
 	     national.distorted.org.uk.))
@@ -390,21 +385,18 @@ (defrevzone trusted
 
 (defzone dhcp.199.29.172.in-addr.arpa
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.))
 
 (defrevzone untrusted
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.))
 
 (defzone 128-143.238.187.81.in-addr.arpa
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
@@ -413,7 +405,6 @@ (defzone 128-143.238.187.81.in-addr.arpa
 
 (defzone 64-79.12.169.217.in-addr.arpa
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
@@ -422,7 +413,6 @@ (defzone 64-79.12.169.217.in-addr.arpa
 
 (defzone 195.113.2.81.in-addr.arpa
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
@@ -431,13 +421,11 @@ (defzone 195.113.2.81.in-addr.arpa
 
 (defrevzone (distorted.org.uk-aaisp :family :ipv6)
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
        secondary-dns.co.uk.)
   (0.7.3.6.8.6.4.6.1.0.0.0 :ns (radius.distorted.org.uk.
-				vampire.distorted.org.uk.
 				precision.distorted.org.uk.
 				telecaster.distorted.org.uk.
 				national.distorted.org.uk.))
@@ -445,7 +433,6 @@ (defrevzone (distorted.org.uk-aaisp :family :ipv6)
 
 (defrevzone (dhcp :family :ipv6)
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.))