cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-04-21 11:10:14 -04:00
parent 7d59a568a3
commit 789d2580ae
Failed to extract signature
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -116,7 +116,7 @@ mumbleServer hosts = combineProperties "mumble.debian.net"
] ]
obnamLowMem :: Property obnamLowMem :: Property
obnamLowMem = propertyList "obnam tuned for low memory use" obnamLowMem = combineProperties "obnam tuned for low memory use"
[ Obnam.latestVersion [ Obnam.latestVersion
, "/etc/obnam.conf" `File.containsLines` , "/etc/obnam.conf" `File.containsLines`
[ "# Suggested by liw to keep Obnam memory consumption down (at some speed cost)." [ "# 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" , " SSLCertificateChainFile /etc/ssl/certs/startssl.pem"
] ]
gitAnnexDistributor :: Property
annexRsyncServer :: Property gitAnnexDistributor = combineProperties "git-annex distributor, including rsync server and signer"
annexRsyncServer = combineProperties "rsync server for git-annex autobuilders"
[ Apt.installed ["rsync"] [ Apt.installed ["rsync"]
, File.hasPrivContent "/etc/rsyncd.conf" , File.hasPrivContent "/etc/rsyncd.conf"
, File.hasPrivContent "/etc/rsyncd.secrets" , File.hasPrivContent "/etc/rsyncd.secrets"
@ -262,6 +261,7 @@ annexRsyncServer = combineProperties "rsync server for git-annex autobuilders"
`onChange` Service.running "rsync" `onChange` Service.running "rsync"
, endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild" , endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild"
, endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks" , endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks"
, Gpg.keyImported "89C809CB" "joey"
] ]
where where
endpoint d = combineProperties ("endpoint " ++ d) endpoint d = combineProperties ("endpoint " ++ d)

5
config-joey.hs
View File

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