summaryrefslogtreecommitdiff
path: root/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-02 20:26:38 -0400
committerJoey Hess2014-04-02 20:26:38 -0400
commit73fcd794e4258342740646ad0016a731f26e6951 (patch)
tree9ab7a0ebc9fcb75aca5b1817feec2deabffb2643 /Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
parenta5524343704a4037d5a4dd0a860a50f3eaeee12c (diff)
propellor spin
Diffstat (limited to 'Propellor/Property/SiteSpecific/GitAnnexBuilder.hs')
-rw-r--r--Propellor/Property/SiteSpecific/GitAnnexBuilder.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 7b823ed6..f4e13149 100644
--- a/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -17,8 +17,7 @@ builder arch crontimes rsyncupload = combineProperties "gitannexbuilder"
[ Apt.stdSourcesList Unstable
, Apt.buildDep ["git-annex"]
, Apt.installed ["git", "rsync", "moreutils", "ca-certificates",
- "liblockfile-simple-perl", "cabal-install", "vim", "less",
- "libghc-fdo-notify-dev"]
+ "liblockfile-simple-perl", "cabal-install", "vim", "less"]
, serviceRunning "cron" `requires` Apt.installed ["cron"]
, User.accountFor builduser
, check (lacksdir builddir) $ userScriptProperty builduser
@@ -31,6 +30,9 @@ builder arch crontimes rsyncupload = combineProperties "gitannexbuilder"
[ "cd " ++ builddir
, "git clone git://git-annex.branchable.com/ build"
]
+ , Property "git-annex source build deps installed" $ do
+ d <- homedir
+ ensureProperty $ Apt.buildDepIn (d </> builddir </> "build")
, Cron.niceJob "gitannexbuilder" crontimes builduser ("~/" ++ builddir) "git pull ; ./autobuild"
-- The builduser account does not have a password set,
-- instead use the password privdata to hold the rsync server