X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/3e38779fc5875973abce9b4e3e43de3f96a3f359..0d4c7fbac87425b0334c69c46b1699b13338b877:/distorted.lisp diff --git a/distorted.lisp b/distorted.lisp index c7cc628..0c22c69 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -79,13 +79,9 @@ (chiark.ns :ip chiark.greenend.org.uk)) ;; Mail servers. - ((@ mail blackhole) - :mx mail - :srv ((:smtp mail))) - ((lists bugs cryptomail) - :ttl 300 - :mx mail - :srv ((:smtp old-mail))) + ((@ 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 :dkim ("stratocaster-20140403" @@ -146,18 +142,22 @@ ;; Colocated services. ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz") - (jump :svc jazz.jump :sshfp "jazz")) + (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"))) - (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") @@ -170,7 +170,6 @@ (dmz :svc artist.dmz)) (mirror (dmz :svc roadstar.dmz :sshfp "roadstar") (unsafe :svc roadstar.unsafe :sshfp "roadstar")) - ((wiki bugs old-mail i2p) :svc vampire :sshfp "vampire") ;; Internal services. #+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire") @@ -211,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")) @@ -340,9 +344,9 @@ (vampire.ns :ip vampire.dmz)) (gibson :addr gibson.unsafe) (crybaby :addr crybaby.unsafe) + (lespaul :addr lespaul.unsafe) (gretsch :addr gretsch.unsafe) (haze :addr haze.unsafe) - (lespaul :addr lespaul.safe) (invader :addr invader.safe) (marauder :addr marauder.safe))