Makefile, distorted.lisp, hosts.lisp: Finish renumbering for A&A switchover.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 9f03e00..7c9c41e 100644 (file)
--- 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)
-                    #+(or) (vampire.ns :ip vampire))
+                    (vampire.ns :ip vampire))
       #-view/inside ((radius.ns :ip radius)
                     (precision.ns :ip precision)
                     (telecaster.ns :ip telecaster)
@@ -165,8 +165,7 @@
   (cabal :svc stratocaster.colo :sshfp "stratocaster")
 
   ;; Local services.
-  ((rawk pifi) (unsafe :svc artist.unsafe)
-              (dmz :svc artist.dmz))
+  ((rawk pifi) (unsafe :svc artist.unsafe) (dmz :svc artist.dmz))
   (mirror (dmz :svc roadstar.dmz :sshfp "roadstar")
          (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
 
@@ -310,7 +309,7 @@
   (dhcp :ns ((radius.ns.dhcp :ip radius)
             (precision.ns.dhcp :ip precision)
             (telecaster.ns.dhcp :ip telecaster)
-            #+(or) (vampire.ns.dhcp :ip vampire))
+            (vampire.ns.dhcp :ip vampire))
        :ds ((55966 :rsasha256 :sha1
             "95b05c1f4e84f950f29630004bac447f8a87ca33")
             (55966 :rsasha256 :sha256
@@ -319,7 +318,7 @@
   (dyn :ns ((radius.ns.dyn :ip radius)
            (precision.ns.dyn :ip precision)
            (telecaster.ns.dyn :ip telecaster)
-           #+(or) (vampire.ns.dyn :ip vampire))
+           (vampire.ns.dyn :ip vampire))
        :ds ((11335 :rsasha256 :sha1
            "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
            (11335 :rsasha256 :sha256
@@ -328,7 +327,7 @@
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
               (precision.ns.dnserr :ip precision.jump)
               (telecaster.ns.dnserr :ip telecaster)
-              #+(or) (vampire.ns.dnserr :ip vampire.dmz))
+              (vampire.ns.dnserr :ip vampire.dmz))
          :ds ((40945 :rsasha256 :sha1
                "f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
               (40945 :rsasha256 :sha256
@@ -343,7 +342,7 @@
   :ns ((radius.ns :ip radius.dmz)
        (precision.ns :ip precision.jump)
        (telecaster.ns :ip telecaster.jump)
-       #+(or) (vampire.ns :ip vampire.dmz))
+       (vampire.ns :ip vampire.dmz))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
@@ -359,7 +358,7 @@
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       #+(or) vampire.distorted.org.uk.)
+       vampire.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
   :reverse colo
@@ -368,63 +367,68 @@
   (dhcp :ns (radius.distorted.org.uk.
             precision.distorted.org.uk.
             telecaster.distorted.org.uk.
-            #+(or) vampire.distorted.org.uk.))
+            vampire.distorted.org.uk.))
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
-(defrevzone (dmz :family :ipv6)
+(defzone dhcp.199.29.172.in-addr.arpa
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       #+(or) vampire.distorted.org.uk.)
-  :reverse dmz)
+       vampire.distorted.org.uk.))
 
-(defrevzone (dmz :family :ipv4)
-  (144-159 :ns (radius.distorted.org.uk.
-               precision.distorted.org.uk.
-               telecaster.distorted.org.uk.
-               #+(or) vampire.distorted.org.uk.))
-  :multi ((dmz :suffix "144-159") :cname *))
+(defrevzone untrusted
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.))
 
-(defzone 144-159.204.49.62.in-addr.arpa
+(defzone 128-143.238.187.81.in-addr.arpa
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       #+(or) vampire.distorted.org.uk.)
+       vampire.distorted.org.uk.)
   :reverse ((((:ipv4 dmz)))))
 
+(defzone 195.113.2.81.in-addr.arpa
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse ((((:ipv4 gw)))))
+
 (defrevzone (jump :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       #+(or) vampire.distorted.org.uk.)
+       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.
-             #+(or) vampire.distorted.org.uk.))
+             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.
-       #+(or) vampire.distorted.org.uk.)
+       vampire.distorted.org.uk.)
   :reverse ((((:ipv4 jump)))))
 
-(defrevzone distorted.org.uk-he
+(defrevzone (distorted.org.uk-aaisp :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       #+(or) vampire.distorted.org.uk.)
-  :reverse distorted.org.uk-he)
+       vampire.distorted.org.uk.)
+  :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
 
 (defrevzone distorted.org.uk-jump
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       #+(or) vampire.distorted.org.uk.)
+       vampire.distorted.org.uk.)
   :reverse distorted.org.uk-jump)
 
 (defzone io.distorted.org.uk