X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/68db42b5ebc64048ef43426511d1b4cca61292ef..0d4c7fbac87425b0334c69c46b1699b13338b877:/distorted.lisp diff --git a/distorted.lisp b/distorted.lisp index 4794842..0c22c69 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -80,6 +80,7 @@ ;; Mail servers. ((@ mail blackhole) :mx mail :srv ((:smtp mail))) + ((bugs) :ttl 300 :mx lists :srv ((:smtp bugs))) ((lists) :ttl 300 :mx lists :srv ((:smtp lists))) (stratocaster.20140403._domainkey @@ -141,22 +142,22 @@ ;; Colocated services. ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz") - (jump :svc jazz.jump :sshfp "jazz")) - (lists (colo :svc telecaster.colo :sshfp "telecaster") - (jump :svc telecaster.jump :sshfp "telecaster")) + (jump :svc jazz.jump :sshfp "jazz") + :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") + :tlsa (:https (:service-certificate-constraint + :public-key :sha-256 #p"https-telecaster"))) ((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"))) - (lists :tlsa ((:smtp :https) (:trust-anchor-assertion - :certificate :sha-256 #p"distorted-ca"))) - (mail :tlsa ((:smtp :submission :imap) - (:trust-anchor-assertion - :certificate :sha-256 #p"distorted-ca"))) + ((www git mail @) :tlsa (:https (:service-certificate-constraint + :public-key :sha-256 + #p"https-stratocaster"))) + (www-cache :tlsa (3127 #1=(:trust-anchor-assertion + :certificate :sha-256 #p"distorted-ca"))) + ((bugs lists) :tlsa (:smtp #1#)) + (mail :tlsa ((:smtp :submission :imap :imaps) #1#)) :svc #+view/inside stratocaster.colo #-view/inside stratocaster.jump (cabal :svc stratocaster.colo :sshfp "stratocaster") @@ -209,6 +210,11 @@ (vpn :addr jazz.vpn :sshfp "jazz") (iodine :addr jazz.iodine :sshfp "jazz")) + ;; Virtual hosts. + (national :abbrev n (linode :abbrev nl) (upn :abbrev ny)) + (national (linode :addr national.linode) + (upn :addr national.upn)) + ;; Media server (on loan to Good Technology HSTG). (jaguar :abbrev jag) (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))