X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/d8ec5b794e3d69968c8332488f4723bdbfe01362..270fa799b8e77c2d05691cb7eec190730d00ee02:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 142b047..860d822 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -141,23 +141,23 @@
 	(: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) (colo :svc telecaster.colo :sshfp "telecaster")
 		(jump :svc telecaster.jump :sshfp "telecaster"))
+  ((bugs lists) :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 mail) :tlsa (:https (:trust-anchor-assertion
+  ((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")))
-  (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 :imaps)
-	       (: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")
@@ -210,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"))