X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/376a10ac4c739001a943fc1fc57bcb1ed473ebb9..3a772cfb9bb9d53599a47de39714ddcddcdbbe1a:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index a9aa9ab..9a1f43e 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -28,9 +28,10 @@
     (dolist (provider (list* any-provider default-provider other-providers))
       (zone-set-address #'rec (cdr provider)
 			:make-ptr-p (eq provider any-provider)
-			:name (concatenate 'string prefix "."
-					   (string-downcase (car provider))
-					   "." (string-downcase zname))))))
+			:name (domain-name-concat prefix
+						  (zone-parse-host
+						   (car provider)
+						   zname))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other definitions.
@@ -57,7 +58,7 @@
 		     (chiark.ns :ip chiark.greenend.org.uk))
 
   ;; Mail servers.
-  ((@ mail)
+  ((@ mail blackhole)
    :mx mail
    :srv ((:smtp mail)))
   ((lists bugs cryptomail)
@@ -161,7 +162,7 @@
 	(dmz :addr anon.dmz))
 
   ;; Fancy connectivity.
-  (iodine (jump :addr jazz.jump))
+  (iodine (jump :svc jazz.jump))
 
   ;; Colocated hosts.
   (colo :net colo)
@@ -221,6 +222,7 @@
   (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby"))
   (terror (vpn :addr terror.vpn :sshfp "terror"))
   (orange (vpn :addr orange.vpn :sshfp "orange"))
+  (haze (vpn :addr haze.vpn))
   (iodine :net iodine)
 
   ;; ITS.
@@ -274,20 +276,48 @@
 	     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.