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

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 0c22c696e090e7db27892e64f0da399381a2bd81..9f03e0028af6cafdc03a604feb88a0013ae17aab 100644 (file)
--- 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)
@@ -141,14 +141,16 @@ (defzone distorted.org.uk
        (:ftp ftp))
 
   ;; Colocated services.
-  ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
-                 (jump :svc jazz.jump :sshfp "jazz")
-                 :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")
-               :tlsa (:https (:service-certificate-constraint
-                              :public-key :sha-256 #p"https-telecaster")))
+  ((irc vox keys wiki) (colo :svc jazz.colo :sshfp "jazz")
+                      (jump :svc jazz.jump :sshfp "jazz"))
+  ((irc vox keys wiki) :tlsa (:https (:service-certificate-constraint
+                                     :public-key :sha-256 #p"https-jazz")))
+  ((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 @@ (defzone distorted.org.uk
   :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)
@@ -269,6 +268,9 @@ (defzone distorted.org.uk
   (jem :abbrev j (unsafe :abbrev ju) (dmz :abbrev jd))
   (jem (unsafe :addr jem.unsafe :sshfp "jem")
        (dmz :addr jem.dmz :sshfp "jem"))
+  (universe :abbrev u (unsafe :abbrev uu) (dmz :abbrev ud))
+  (universe (unsafe :addr universe.unsafe :sshfp "universe")
+           (dmz :addr universe.dmz :sshfp "universe"))
   (artist :abbrev a
          (unsafe :abbrev au) (dmz :abbrev ad) (untrusted :abbrev ax))
   (artist (unsafe :addr artist.unsafe :sshfp "artist")
@@ -308,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
@@ -317,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
@@ -326,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
@@ -341,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)
@@ -357,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
@@ -366,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