X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/6baf2de2facce55fd77bd7376a430f554d7e74ca..2d169acdc49b8012182b327c5deee3a287173cf9:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 1702e1c..c81e13b 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -47,9 +47,11 @@
   ;; Nameservers.
   :ns #+view/inside ((radius.ns :ip radius)
 		     (precision.ns :ip precision)
+		     (telecaster.ns :ip telecaster)
 		     (vampire.ns :ip vampire))
       #-view/inside ((radius.ns :ip radius)
 		     (precision.ns :ip precision)
+		     (telecaster.ns :ip telecaster)
 		     (mythic-beasts-1.ns :ip mythic-ns1)
 		     (mythic-beasts-2.ns :ip mythic-ns2)
 		     (chiark.ns :ip chiark.greenend.org.uk))
@@ -91,10 +93,10 @@
   (ntp :cname ntp0)
 
   (www-cache :anycast ((any www-cache.any)
-		       (jump (:ipv4 telecaster.jump))
-		       (dmz (:ipv4 roadstar.dmz))
-		       (unsafe (:ipv4 roadstar.unsafe))
-		       (colo (:ipv4 telecaster.colo))))
+		       (jump telecaster.jump)
+		       (dmz roadstar.dmz)
+		       (unsafe roadstar.unsafe)
+		       (colo telecaster.colo)))
   (wpad :cname www-cache)
 
   (_kerberos :txt "DISTORTED.ORG.UK")
@@ -138,8 +140,9 @@
   :svc #+view/inside stratocaster.colo
        #-view/inside stratocaster.jump
   (cabal :svc stratocaster.colo :sshfp "stratocaster")
-  ((db ftp dyndns) (colo :svc telecaster.colo :sshfp "telecaster")
-		   (jump :svc telecaster.jump :sshfp "telecaster"))
+  ((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)
@@ -158,7 +161,7 @@
 	(dmz :addr anon.dmz))
 
   ;; Fancy connectivity.
-  (iodine (jump :addr jazz.jump))
+  (iodine (jump :svc jazz.jump))
 
   ;; Colocated hosts.
   (colo :net colo)
@@ -179,10 +182,10 @@
 	(iodine :addr jazz.iodine :sshfp "jazz"))
 
   ;; Media server (on loan to Good Technology HSTG).
-  (jaguar (jump :addr jaguar.jump))
+  (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))
 
   ;; Nicko's server.
-  (richmond (jump :addr richmond.jump))
+  (richmond (jump :svc richmond.jump))
 
   ;; Wired ethernet.
   (unsafe :net unsafe)
@@ -231,12 +234,15 @@
   ;; Delegations.
   (dhcp :ns ((radius.ns.dhcp :ip radius)
 	     (precision.ns.dhcp :ip precision)
+	     (telecaster.ns.dhcp :ip telecaster)
 	     (vampire.ns.dhcp :ip vampire)))
   (dyn :ns ((radius.ns.dyn :ip radius)
 	    (precision.ns.dyn :ip precision)
+	    (telecaster.ns.dyn :ip telecaster)
 	    (vampire.ns.dyn :ip vampire)))
   (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)))
   (io :ns ((ns.io :ip jazz.jump))))
 
@@ -249,9 +255,13 @@
   (invader :addr invader.safe)
   (marauder :addr marauder.safe))
 
+(defzone nicko.org
+  (richmond :addr richmond.jump))
+
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
@@ -260,30 +270,63 @@
   :reverse any
   (dhcp :ns (radius.distorted.org.uk.
 	     precision.distorted.org.uk.
+	     telecaster.distorted.org.uk.
 	     vampire.distorted.org.uk.))
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
-(defrevzone dmz
+(defrevzone (dmz :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse dmz)
 
-(defrevzone jump
+(defrevzone (dmz :family :ipv4)
+  (144-159 :ns (radius.distorted.org.uk.
+		precision.distorted.org.uk.
+		telecaster.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.
+       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.)
   :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.))
+  :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.)
+  :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.)
   :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.)
   :reverse distorted.org.uk-jump)