distorted.lisp: Service name for keyserver.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index a9aa9ab69459695639232be526a99c8fb115dd4c..aa936380c3f80066f638505db0b071d959488a6c 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -28,9 +28,10 @@ (defzoneparse :anycast (name data rec :prefix prefix :zname zname)
     (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 @@ (defzone distorted.org.uk
                     (chiark.ns :ip chiark.greenend.org.uk))
 
   ;; Mail servers.
-  ((@ mail)
+  ((@ mail blackhole)
    :mx mail
    :srv ((:smtp mail)))
   ((lists bugs cryptomail)
@@ -133,10 +134,19 @@ (defzone distorted.org.uk
   (evolution :alias evo)
 
   ;; Colocated services.
-  ((irc vox) (colo :svc jazz.colo :sshfp "jazz")
-            (jump :svc jazz.jump :sshfp "jazz"))
+  ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
+                 (jump :svc jazz.jump :sshfp "jazz"))
   ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster")
                  (jump :svc stratocaster.jump :sshfp "stratocaster"))
+  ((www @) :tlsa (:https (:service-certificate-constraint
+                         :certificate :sha-256 #p"http-server-www#1")))
+  (git :tlsa (:https (:trust-anchor-assertion
+                     :certificate :sha-256 #p"distorted-ca")))
+  (www-cache :tlsa (3127 (:trust-anchor-assertion
+                         :certificate :sha-256 #p"distorted-ca")))
+  (mail :tlsa ((:smtp :submission :imap)
+              (:trust-anchor-assertion
+               :certificate :sha-256 #p"distorted-ca")))
   :svc #+view/inside stratocaster.colo
        #-view/inside stratocaster.jump
   (cabal :svc stratocaster.colo :sshfp "stratocaster")
@@ -161,7 +171,7 @@ (defzone distorted.org.uk
        (dmz :addr anon.dmz))
 
   ;; Fancy connectivity.
-  (iodine (jump :addr jazz.jump))
+  (iodine (jump :svc jazz.jump))
 
   ;; Colocated hosts.
   (colo :net colo)
@@ -215,12 +225,15 @@ (defzone distorted.org.uk
   (firebird :cname firebird.dhcp)
   (marauder :cname marauder.dhcp)
   (invader :cname invader.dhcp)
+  (gretsch :cname gretsch.dhcp)
 
   ;; Virtual network.
   (vpn :net vpn)
   (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"))
+  (groove (vpn :addr groove.vpn :sshfp "groove"))
   (iodine :net iodine)
 
   ;; ITS.
@@ -274,20 +287,48 @@ (defrevzone trusted
             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.