Hack :ANY pseudo-record type to cope with the new domain name objects.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 02dbfdf..80200d2 100644 (file)
--- 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)
@@ -182,7 +183,7 @@
        (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 :svc richmond.jump))
@@ -274,20 +275,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.