X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/84bfdc6249b8640f3284b125428cd141fb4c316a..be02ca0e993b0c72598579216f07c952d8f2e6fd:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index da00125..56f19eb 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -141,25 +141,28 @@
 	(:ftp ftp))
 
   ;; 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"))
+  ((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
-			  :public-key :sha-256 #p"https-stratocaster")))
-  ((git mail) :tlsa (:https #1=(:trust-anchor-assertion
-				:certificate :sha-256 #p"distorted-ca")))
-  (www-cache :tlsa (3127 #1#))
+  ((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)
@@ -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")