X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/2d7b9fe6d9a55149315e927f6b17051f68c52618..beb363e02ee813d05880fe4287aee966346c51d4:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 4d15a9e..ae1c623 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"
@@ -147,6 +143,8 @@
   ;; Colocated services.
   ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
 		  (jump :svc jazz.jump :sshfp "jazz"))
+  ((bugs lists) (colo :svc telecaster.colo :sshfp "telecaster")
+		(jump :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
@@ -155,6 +153,8 @@
 		      :certificate :sha-256 #p"distorted-ca")))
   (www-cache :tlsa (3127 (:trust-anchor-assertion
 			  :certificate :sha-256 #p"distorted-ca")))
+  ((bugs lists) :tlsa (:smtp (:trust-anchor-assertion
+			      :certificate :sha-256 #p"distorted-ca")))
   (mail :tlsa ((:smtp :submission :imap)
 	       (:trust-anchor-assertion
 		:certificate :sha-256 #p"distorted-ca")))
@@ -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")