From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 14 Feb 2016 02:51:16 +0000 (+0000)
Subject: distorted.lisp: vampire is out of action, so remove it from NS lists.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/commitdiff_plain/e0f61b9f8497b64c7502253e8d426203e297f148?hp=be02ca0e993b0c72598579216f07c952d8f2e6fd

distorted.lisp: vampire is out of action, so remove it from NS lists.
---

diff --git a/distorted.lisp b/distorted.lisp
index 56f19eb..9f03e00 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -70,7 +70,7 @@ (defzone distorted.org.uk
   :ns #+view/inside ((radius.ns :ip radius)
 		     (precision.ns :ip precision)
 		     (telecaster.ns :ip telecaster)
-		     (vampire.ns :ip vampire))
+		     #+(or) (vampire.ns :ip vampire))
       #-view/inside ((radius.ns :ip radius)
 		     (precision.ns :ip precision)
 		     (telecaster.ns :ip telecaster)
@@ -310,7 +310,7 @@ (defzone distorted.org.uk
   (dhcp :ns ((radius.ns.dhcp :ip radius)
 	     (precision.ns.dhcp :ip precision)
 	     (telecaster.ns.dhcp :ip telecaster)
-	     (vampire.ns.dhcp :ip vampire))
+	     #+(or) (vampire.ns.dhcp :ip vampire))
 	:ds ((55966 :rsasha256 :sha1
 	     "95b05c1f4e84f950f29630004bac447f8a87ca33")
 	     (55966 :rsasha256 :sha256
@@ -319,7 +319,7 @@ (defzone distorted.org.uk
   (dyn :ns ((radius.ns.dyn :ip radius)
 	    (precision.ns.dyn :ip precision)
 	    (telecaster.ns.dyn :ip telecaster)
-	    (vampire.ns.dyn :ip vampire))
+	    #+(or) (vampire.ns.dyn :ip vampire))
        :ds ((11335 :rsasha256 :sha1
 	    "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
 	    (11335 :rsasha256 :sha256
@@ -328,7 +328,7 @@ (defzone distorted.org.uk
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
 	       (precision.ns.dnserr :ip precision.jump)
 	       (telecaster.ns.dnserr :ip telecaster)
-	       (vampire.ns.dnserr :ip vampire.dmz))
+	       #+(or) (vampire.ns.dnserr :ip vampire.dmz))
 	  :ds ((40945 :rsasha256 :sha1
 		"f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
 	       (40945 :rsasha256 :sha256
@@ -343,7 +343,7 @@ (defzone dhcp.distorted.org.uk
   :ns ((radius.ns :ip radius.dmz)
        (precision.ns :ip precision.jump)
        (telecaster.ns :ip telecaster.jump)
-       (vampire.ns :ip vampire.dmz))
+       #+(or) (vampire.ns :ip vampire.dmz))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
@@ -359,7 +359,7 @@ (defrevzone trusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       #+(or) vampire.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
   :reverse colo
@@ -368,63 +368,63 @@ (defrevzone trusted
   (dhcp :ns (radius.distorted.org.uk.
 	     precision.distorted.org.uk.
 	     telecaster.distorted.org.uk.
-	     vampire.distorted.org.uk.))
+	     #+(or) vampire.distorted.org.uk.))
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
 (defrevzone (dmz :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       #+(or) vampire.distorted.org.uk.)
   :reverse dmz)
 
 (defrevzone (dmz :family :ipv4)
   (144-159 :ns (radius.distorted.org.uk.
 		precision.distorted.org.uk.
 		telecaster.distorted.org.uk.
-		vampire.distorted.org.uk.))
+		#+(or) vampire.distorted.org.uk.))
   :multi ((dmz :suffix "144-159") :cname *))
 
 (defzone 144-159.204.49.62.in-addr.arpa
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       #+(or) vampire.distorted.org.uk.)
   :reverse ((((:ipv4 dmz)))))
 
 (defrevzone (jump :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       #+(or) vampire.distorted.org.uk.)
   :reverse jump)
 
 (defrevzone (jump :family :ipv4)
   (64-79 :ns (radius.distorted.org.uk.
 	      precision.distorted.org.uk.
 	      telecaster.distorted.org.uk.
-	      vampire.distorted.org.uk.))
+	      #+(or) vampire.distorted.org.uk.))
   :multi ((jump :suffix "64-79") :cname *))
 
 (defzone 64-79.198.13.212.in-addr.arpa
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       #+(or) vampire.distorted.org.uk.)
   :reverse ((((:ipv4 jump)))))
 
 (defrevzone distorted.org.uk-he
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       #+(or) vampire.distorted.org.uk.)
   :reverse distorted.org.uk-he)
 
 (defrevzone distorted.org.uk-jump
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       vampire.distorted.org.uk.)
+       #+(or) vampire.distorted.org.uk.)
   :reverse distorted.org.uk-jump)
 
 (defzone io.distorted.org.uk