X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/664e6cf95b818fd519f19fa22769072e79cfd5eb..e0f61b9f8497b64c7502253e8d426203e297f148:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 94786a0..9f03e00 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -70,7 +70,7 @@
   :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)
@@ -145,10 +145,12 @@
 		       (jump :svc jazz.jump :sshfp "jazz"))
   ((irc vox keys wiki) :tlsa (:https (:service-certificate-constraint
 				      :public-key :sha-256 #p"https-jazz")))
-  ((bugs lists) (colo :svc telecaster.colo :sshfp "telecaster")
-		(jump :svc telecaster.jump :sshfp "telecaster"))
-  ((bugs lists) :tlsa (:https (:service-certificate-constraint
-			       :public-key :sha-256 #p"https-telecaster")))
+  ((bugs lists db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
+		       (jump :svc telecaster.jump :sshfp "telecaster"))
+  ((bugs lists ftp) :tlsa (:https (:service-certificate-constraint
+				   :public-key :sha-256
+				   #p"https-telecaster")))
+  (dyndns :svc telecaster.jump :sshfp "telecaster")
   ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster")
 		  (jump :svc stratocaster.jump :sshfp "stratocaster"))
   ((www git mail @) :tlsa (:https (:service-certificate-constraint
@@ -161,9 +163,6 @@
   :svc #+view/inside stratocaster.colo
        #-view/inside stratocaster.jump
   (cabal :svc stratocaster.colo :sshfp "stratocaster")
-  ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
-	    (jump :svc telecaster.jump :sshfp "telecaster"))
-  (dyndns :svc telecaster.jump :sshfp "telecaster")
 
   ;; Local services.
   ((rawk pifi) (unsafe :svc artist.unsafe)
@@ -311,7 +310,7 @@
   (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
@@ -320,7 +319,7 @@
   (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
@@ -329,7 +328,7 @@
   (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
@@ -344,7 +343,7 @@
   :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)
@@ -360,7 +359,7 @@
   :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
@@ -369,63 +368,63 @@
   (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