From be02ca0e993b0c72598579216f07c952d8f2e6fd Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 14 Feb 2016 02:33:48 +0000 Subject: [PATCH] distorted.lisp: Rearrange telecaster's services a bit. Organization: Straylight/Edgeware From: Mark Wooding * Make sure the ftp service advertises a TLSA record. * Merge the ftp and db stanzas in with the bugs and mailing-list servers, which somehow managed to be at opposite ends of the section. * Move dyndns near the others, for company. --- distorted.lisp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/distorted.lisp b/distorted.lisp index 94786a0..56f19eb 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -145,10 +145,12 @@ (defzone distorted.org.uk (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"))) + ((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 git mail @) :tlsa (:https (:service-certificate-constraint @@ -161,9 +163,6 @@ (defzone distorted.org.uk :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) -- [mdw]