From 73fcd794e4258342740646ad0016a731f26e6951 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 2 Apr 2014 20:26:38 -0400 Subject: propellor spin --- Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Propellor/Property/SiteSpecific') 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 -- cgit v1.3-2-g0d8e