propellor spin

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)

config-joey.hs

@@ -100,7 +100,10 @@ hosts =               --                  (o)  `
 		& Apt.unattendedUpgrades
 		& Apt.serviceInstalledRunning "ntp"
 		& Postfix.satellite
+
+		-- Diatom has 500 mb of memory, so tune for that.
 		& JoeySites.obnamLowMem
+		& Apt.serviceInstalledRunning "swapspace"
 	
 		& Apt.serviceInstalledRunning "apache2"
 		& File.hasPrivContent "/etc/ssl/certs/web.pem"
@@ -119,7 +122,7 @@ hosts =               --                  (o)  `
 			"downloads.kitenet.net"
 			"840760dc-08f0-11e2-8c61-576b7e66acfd"
 			[("turtle", "ssh://turtle.kitenet.net/~/lib/downloads/")]
-		& JoeySites.annexRsyncServer
+		& JoeySites.gitAnnexDistributor
 
 		& alias "tmp.kitenet.net"
 		& JoeySites.annexWebSite hosts "/srv/git/joey/tmp.git"