distorted.lisp, keys/haze.sshfp: Deploy haze properly.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index c81e13b..73fd09d 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)
@@ -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 :sshfp "haze"))
   (iodine :net iodine)
 
   ;; ITS.