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

diff --git a/distorted.lisp b/distorted.lisp
index 9f03e00..4b17c24 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)
-		     #+(or) (vampire.ns :ip vampire))
+		     (vampire.ns :ip vampire))
       #-view/inside ((radius.ns :ip radius)
 		     (precision.ns :ip precision)
 		     (telecaster.ns :ip telecaster)
@@ -91,10 +91,12 @@
   (dns0 :anycast ((any dns0.any)
 		  (jump precision.jump)
 		  (colo precision.colo)
+		  (aaisp radius.aaisp)
 		  (dmz radius.dmz)
 		  (unsafe radius.unsafe)))
   (dns1 :anycast ((any dns1.any)
 		  (jump telecaster.jump)
+		  (aaisp vampire.aaisp)
 		  (dmz vampire.dmz)
 		  (unsafe vampire.unsafe)
 		  (colo telecaster.colo)))
@@ -102,16 +104,19 @@
 
   (ntp0 :anycast ((any ntp0.any)
 		  (jump fender.jump)
+		  (aaisp ibanez.aaisp)
 		  (dmz ibanez.dmz)
 		  (unsafe ibanez.unsafe)
 		  (colo  fender.colo)))
   (ntp1 :anycast ((any ntp1.any)
+		  (aaisp vampire.aaisp)
 		  (dmz vampire.dmz)
 		  (unsafe vampire.unsafe)))
   (ntp :cname ntp0)
 
   (www-cache :anycast ((any www-cache.any)
 		       (jump telecaster.jump)
+		       (aaisp roadstar.aaisp)
 		       (dmz roadstar.dmz)
 		       (unsafe roadstar.unsafe)
 		       (colo telecaster.colo)))
@@ -120,13 +125,16 @@
   (_kerberos :txt "DISTORTED.ORG.UK")
   (krb0 :anycast ((any krb0.any)
 		  (jump precision.jump)
+		  (aaisp radius.aaisp)
 		  (dmz radius.dmz)
 		  (unsafe radius.unsafe)
 		  (colo precision.colo)))
   (krb1 :anycast ((any krb1.any)
+		  (aaisp vampire.aaisp)
 		  (dmz vampire.dmz)
 		  (unsafe vampire.unsafe)))
   (krb-master (unsafe :svc radius.unsafe)
+	      (aaisp :svc radius.aaisp)
 	      (dmz :svc radius.dmz))
   :srv (((:kerberos :protocol :udp)
 	 krb0
@@ -166,8 +174,10 @@
 
   ;; Local services.
   ((rawk pifi) (unsafe :svc artist.unsafe)
+	       (aaisp :svc artist.aaisp)
 	       (dmz :svc artist.dmz))
-  (mirror (dmz :svc roadstar.dmz :sshfp "roadstar")
+  (mirror (aasip :svc roadstar.aaisp :sshfp "roadstar")
+	  (dmz :svc roadstar.dmz :sshfp "roadstar")
 	  (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
 
   ;; Internal services.
@@ -177,6 +187,7 @@
   (anon (colo :svc jazz.colo)
 	(unsafe :svc vampire.unsafe)
 	(jump :addr anon.jump)
+	(aaisp :addr anon.aaisp)
 	(dmz :addr anon.dmz))
 
   ;; Fancy connectivity.
@@ -222,9 +233,12 @@
   (richmond (jump :svc richmond.jump))
 
   ;; Entry is via little router box.
+  (aaisp :net aaisp)
   (dmz :net dmz)
-  (guvnor (dmz :addr guvnor.dmz))
-  (nat (dmz :addr nat.dmz))
+  (guvnor (dmz :addr guvnor.dmz)
+	  (aaisp :addr guvnor.aaisp))
+  (nat (dmz :addr nat.dmz)
+       (aaisp :addr nat.aaisp))
 
   ;; Wireless gateway.
   (wireless :net wireless)
@@ -244,36 +258,45 @@
   (safe :net safe)
   (untrusted :net untrusted)
   (vampire :abbrev v
-	   (unsafe :abbrev vu) (dmz :abbrev vd) (vpn :abbrev vv)
-	   (safe :abbrev vs) (untrusted :abbrev vx))
+	   (unsafe :abbrev vu) (aaisp :abbrev va) (dmz :abbrev vd)
+	   (vpn :abbrev vv) (safe :abbrev vs) (untrusted :abbrev vx))
   (vampire (unsafe :addr vampire.unsafe :sshfp "vampire")
+	   (aaisp :addr vampire.aaisp :sshfp "vampire")
 	   (dmz :addr vampire.dmz :sshfp "vampire")
 	   (vpn :addr vampire.vpn :sshfp "vampire")
 	   (safe :addr vampire.safe :sshfp "vampire")
 	   (untrusted :addr vampire.untrusted :sshfp "vampire"))
-  (ibanez :abbrev i (unsafe :abbrev iu) (dmz :abbrev id))
+  (ibanez :abbrev i (unsafe :abbrev iu) (aaisp :abbrev ia) (dmz :abbrev id))
   (ibanez (unsafe :addr ibanez.unsafe :sshfp "ibanez")
+	  (aaisp :addr ibanez.aaisp :sshfp "ibanez")
 	  (dmz :addr ibanez.dmz :sshfp "ibanez"))
   (radius :abbrev r
-	  (unsafe :abbrev ru) (dmz :abbrev rd) (vpn :abbrev rv)
-	  (safe :abbrev rs) (untrusted :abbrev rx))
+	  (unsafe :abbrev ru) (aaisp :abbrev ra) (dmz :abbrev rd)
+	  (vpn :abbrev rv) (safe :abbrev rs) (untrusted :abbrev rx))
   (radius (unsafe :addr radius.unsafe :sshfp "radius")
+	  (aaisp :addr radius.aaisp :sshfp "radius")
 	  (dmz :addr radius.dmz :sshfp "radius")
 	  (vpn :addr radius.vpn :sshfp "radius")
 	  (safe :addr radius.safe :sshfp "radius")
 	  (untrusted :addr radius.untrusted :sshfp "radius"))
-  (roadstar :abbrev rg (unsafe :abbrev rgu) (dmz :abbrev rgd))
+  (roadstar :abbrev rg (unsafe :abbrev rgu)
+	    (aaisp :abbrev rga) (dmz :abbrev rgd))
   (roadstar (unsafe :addr roadstar.unsafe :sshfp "roadstar")
+	    (aaisp :addr roadstar.aaisp :sshfp "roadstar")
 	    (dmz :addr roadstar.dmz :sshfp "roadstar"))
-  (jem :abbrev j (unsafe :abbrev ju) (dmz :abbrev jd))
+  (jem :abbrev j (unsafe :abbrev ju) (aaisp :abbrev ja) (dmz :abbrev jd))
   (jem (unsafe :addr jem.unsafe :sshfp "jem")
+       (aaisp :addr jem.aaisp :sshfp "jem")
        (dmz :addr jem.dmz :sshfp "jem"))
-  (universe :abbrev u (unsafe :abbrev uu) (dmz :abbrev ud))
+  (universe :abbrev u (unsafe :abbrev uu) (aaisp :abbrev ua) (dmz :abbrev ud))
   (universe (unsafe :addr universe.unsafe :sshfp "universe")
+	    (aaisp :addr universe.aaisp :sshfp "universe")
 	    (dmz :addr universe.dmz :sshfp "universe"))
   (artist :abbrev a
-	  (unsafe :abbrev au) (dmz :abbrev ad) (untrusted :abbrev ax))
+	  (unsafe :abbrev au) (aaisp :abbrev aa) (dmz :abbrev ad)
+	  (untrusted :abbrev ax))
   (artist (unsafe :addr artist.unsafe :sshfp "artist")
+	  (aaisp :addr artist.aaisp :sshfp "artist")
 	  (dmz :addr artist.dmz :sshfp "artist")
 	  (untrusted :addr artist.untrusted :sshfp "artist"))
   (groove :abbrev gr)
@@ -310,7 +333,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 +342,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 +351,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 +366,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 +382,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 +391,84 @@
   (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)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       #+(or) vampire.distorted.org.uk.)
+       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.
-		#+(or) vampire.distorted.org.uk.))
+		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.
-       #+(or) vampire.distorted.org.uk.)
+       vampire.distorted.org.uk.)
   :reverse ((((:ipv4 dmz)))))
 
+(defzone 128-143.238.187.81.in-addr.arpa
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse ((((:ipv4 aaisp)))))
+
+(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 aaisp-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
   :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-he)
 
+(defrevzone (aaisp :family :ipv6)
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse ((((:ipv6 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