From 789d2580ae4bc7d0826117502849b61ed176737b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 21 Apr 2014 11:10:14 -0400 Subject: propellor spin --- Propellor/Property/SiteSpecific/JoeySites.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Propellor/Property') diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs index 74c47be7..cef64e23 100644 --- a/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/Propellor/Property/SiteSpecific/JoeySites.hs @@ -116,7 +116,7 @@ mumbleServer hosts = combineProperties "mumble.debian.net" ] obnamLowMem :: Property -obnamLowMem = propertyList "obnam tuned for low memory use" +obnamLowMem = combineProperties "obnam tuned for low memory use" [ Obnam.latestVersion , "/etc/obnam.conf" `File.containsLines` [ "# Suggested by liw to keep Obnam memory consumption down (at some speed cost)." @@ -252,9 +252,8 @@ mainhttpscert True = , " SSLCertificateChainFile /etc/ssl/certs/startssl.pem" ] - -annexRsyncServer :: Property -annexRsyncServer = combineProperties "rsync server for git-annex autobuilders" +gitAnnexDistributor :: Property +gitAnnexDistributor = combineProperties "git-annex distributor, including rsync server and signer" [ Apt.installed ["rsync"] , File.hasPrivContent "/etc/rsyncd.conf" , File.hasPrivContent "/etc/rsyncd.secrets" @@ -262,6 +261,7 @@ annexRsyncServer = combineProperties "rsync server for git-annex autobuilders" `onChange` Service.running "rsync" , endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild" , endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks" + , Gpg.keyImported "89C809CB" "joey" ] where endpoint d = combineProperties ("endpoint " ++ d) -- cgit v1.2.3