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

diff --git a/distorted.lisp b/distorted.lisp
index 0289a8b..adc8f24 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -79,17 +79,9 @@
 		     (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)))
+  ((bugs) :ttl 300 :mx lists :srv ((:smtp bugs)))
+  ((lists) :ttl 300 :mx lists :srv ((:smtp lists)))
 
   (stratocaster.20140403._domainkey
    :dkim ("stratocaster-20140403"
@@ -151,19 +143,19 @@
   ;; 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"))
+  ((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
 			  :certificate :sha-256 #p"http-server-www#1")))
-  (git :tlsa (:https (:trust-anchor-assertion
-		      :certificate :sha-256 #p"distorted-ca")))
+  ((git mail) :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)
+  ((bugs lists) :tlsa (:smtp (:trust-anchor-assertion
+			      :certificate :sha-256 #p"distorted-ca")))
+  (mail :tlsa ((:smtp :submission :imap :imaps)
 	       (:trust-anchor-assertion
 		:certificate :sha-256 #p"distorted-ca")))
   :svc #+view/inside stratocaster.colo
@@ -178,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")
@@ -219,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"))