distorted.lisp: Rearrange telecaster's services a bit.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index adc8f24..56f19eb 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -141,29 +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
-                         :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")
-  ((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)
@@ -269,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")