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

diff --git a/distorted.lisp b/distorted.lisp
index 94786a0..7c9c41e 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -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,13 +163,9 @@
   :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)
-	       (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"))
 
@@ -372,27 +370,32 @@
 	     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.
-       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.
-		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.
        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.
@@ -414,12 +417,12 @@
        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.
        vampire.distorted.org.uk.)
-  :reverse distorted.org.uk-he)
+  :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
 
 (defrevzone distorted.org.uk-jump
   :ns (radius.distorted.org.uk.