diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-21 11:10:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-21 11:10:14 -0400 |
| commit | 789d2580ae4bc7d0826117502849b61ed176737b (patch) | |
| tree | e758574042aef8d8dafddec017fa3ca490e2716f | |
| parent | 7d59a568a3dcc9649c4d12239d01ab92a2b8ef1f (diff) | |
propellor spin
| -rw-r--r-- | Propellor/Property/SiteSpecific/JoeySites.hs | 8 | ||||
| -rw-r--r-- | config-joey.hs | 5 |
2 files changed, 8 insertions, 5 deletions
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) diff --git a/config-joey.hs b/config-joey.hs index e95e05d4..842da803 100644 --- a/config-joey.hs +++ b/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" |