X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/8336c8ffc302e36077d0f7b4488baed0d6cf4a31..f479b0cfdd693f37210bc1dd18fb7c514a919012:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 0289a8b..137ec15 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -79,17 +79,8 @@
 		     (chiark.ns :ip chiark.greenend.org.uk))
 
   ;; Mail servers.
-  ((@ mail blackhole)
-   :mx mail
-   :srv ((:smtp mail)))
-  ((lists)
-   :ttl 300
-   :mx lists
-   :srv ((:smtp lists)))
-  ((bugs cryptomail)
-   :ttl 300
-   :mx mail
-   :srv ((:smtp old-mail)))
+  ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
+  ((lists) :ttl 300 :mx lists :srv ((:smtp lists)))
 
   (stratocaster.20140403._domainkey
    :dkim ("stratocaster-20140403"
@@ -161,8 +152,8 @@
 		      :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")))
+  (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")))
@@ -178,7 +169,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")