X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/3e38779fc5875973abce9b4e3e43de3f96a3f359..e0f61b9f8497b64c7502253e8d426203e297f148:/distorted.lisp diff --git a/distorted.lisp b/distorted.lisp index c7cc628..9f03e00 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -70,7 +70,7 @@ :ns #+view/inside ((radius.ns :ip radius) (precision.ns :ip precision) (telecaster.ns :ip telecaster) - (vampire.ns :ip vampire)) + #+(or) (vampire.ns :ip vampire)) #-view/inside ((radius.ns :ip radius) (precision.ns :ip precision) (telecaster.ns :ip telecaster) @@ -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" @@ -145,32 +141,34 @@ (:ftp ftp)) ;; Colocated services. - ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz") - (jump :svc jazz.jump :sshfp "jazz")) + ((irc vox keys wiki) (colo :svc jazz.colo :sshfp "jazz") + (jump :svc jazz.jump :sshfp "jazz")) + ((irc vox keys wiki) :tlsa (:https (:service-certificate-constraint + :public-key :sha-256 #p"https-jazz"))) + ((bugs lists db ftp) (colo :svc telecaster.colo :sshfp "telecaster") + (jump :svc telecaster.jump :sshfp "telecaster")) + ((bugs lists ftp) :tlsa (:https (:service-certificate-constraint + :public-key :sha-256 + #p"https-telecaster"))) + (dyndns :svc telecaster.jump :sshfp "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") - ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster") - (jump :svc telecaster.jump :sshfp "telecaster")) - (dyndns :svc telecaster.jump :sshfp "telecaster") ;; Local services. ((rawk pifi) (unsafe :svc artist.unsafe) (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 +209,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")) @@ -265,6 +268,9 @@ (jem :abbrev j (unsafe :abbrev ju) (dmz :abbrev jd)) (jem (unsafe :addr jem.unsafe :sshfp "jem") (dmz :addr jem.dmz :sshfp "jem")) + (universe :abbrev u (unsafe :abbrev uu) (dmz :abbrev ud)) + (universe (unsafe :addr universe.unsafe :sshfp "universe") + (dmz :addr universe.dmz :sshfp "universe")) (artist :abbrev a (unsafe :abbrev au) (dmz :abbrev ad) (untrusted :abbrev ax)) (artist (unsafe :addr artist.unsafe :sshfp "artist") @@ -304,7 +310,7 @@ (dhcp :ns ((radius.ns.dhcp :ip radius) (precision.ns.dhcp :ip precision) (telecaster.ns.dhcp :ip telecaster) - (vampire.ns.dhcp :ip vampire)) + #+(or) (vampire.ns.dhcp :ip vampire)) :ds ((55966 :rsasha256 :sha1 "95b05c1f4e84f950f29630004bac447f8a87ca33") (55966 :rsasha256 :sha256 @@ -313,7 +319,7 @@ (dyn :ns ((radius.ns.dyn :ip radius) (precision.ns.dyn :ip precision) (telecaster.ns.dyn :ip telecaster) - (vampire.ns.dyn :ip vampire)) + #+(or) (vampire.ns.dyn :ip vampire)) :ds ((11335 :rsasha256 :sha1 "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9") (11335 :rsasha256 :sha256 @@ -322,7 +328,7 @@ (dnserr :ns ((radius.ns.dnserr :ip radius.dmz) (precision.ns.dnserr :ip precision.jump) (telecaster.ns.dnserr :ip telecaster) - (vampire.ns.dnserr :ip vampire.dmz)) + #+(or) (vampire.ns.dnserr :ip vampire.dmz)) :ds ((40945 :rsasha256 :sha1 "f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b") (40945 :rsasha256 :sha256 @@ -337,12 +343,12 @@ :ns ((radius.ns :ip radius.dmz) (precision.ns :ip precision.jump) (telecaster.ns :ip telecaster.jump) - (vampire.ns :ip vampire.dmz)) + #+(or) (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)) @@ -353,7 +359,7 @@ :ns (radius.distorted.org.uk. precision.distorted.org.uk. telecaster.distorted.org.uk. - vampire.distorted.org.uk.) + #+(or) vampire.distorted.org.uk.) :reverse unsafe :reverse vpn :reverse colo @@ -362,63 +368,63 @@ (dhcp :ns (radius.distorted.org.uk. precision.distorted.org.uk. telecaster.distorted.org.uk. - vampire.distorted.org.uk.)) + #+(or) vampire.distorted.org.uk.)) :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *)) (defrevzone (dmz :family :ipv6) :ns (radius.distorted.org.uk. precision.distorted.org.uk. telecaster.distorted.org.uk. - vampire.distorted.org.uk.) + #+(or) vampire.distorted.org.uk.) :reverse dmz) (defrevzone (dmz :family :ipv4) (144-159 :ns (radius.distorted.org.uk. precision.distorted.org.uk. telecaster.distorted.org.uk. - vampire.distorted.org.uk.)) + #+(or) 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.) + #+(or) 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.) + #+(or) 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.)) + #+(or) 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.) + #+(or) vampire.distorted.org.uk.) :reverse ((((:ipv4 jump))))) (defrevzone distorted.org.uk-he :ns (radius.distorted.org.uk. precision.distorted.org.uk. telecaster.distorted.org.uk. - vampire.distorted.org.uk.) + #+(or) vampire.distorted.org.uk.) :reverse distorted.org.uk-he) (defrevzone distorted.org.uk-jump :ns (radius.distorted.org.uk. precision.distorted.org.uk. telecaster.distorted.org.uk. - vampire.distorted.org.uk.) + #+(or) vampire.distorted.org.uk.) :reverse distorted.org.uk-jump) (defzone io.distorted.org.uk