From 7200baa08a4b841cfc327030f5d66e1f36ac4a5d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Apr 2014 18:31:04 -0400 Subject: propellor spin --- Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Propellor/Property/SiteSpecific/GitAnnexBuilder.hs') diff --git a/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 3c86b33a..b92d5dac 100644 --- a/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -23,17 +23,17 @@ builder arch crontimes = combineProperties "gitannexbuilder" , serviceRunning "cron" `requires` Apt.installed ["cron"] , User.accountFor builduser , check (lacksdir builddir) $ userScriptProperty builduser - [ "git clone git://git.kitenet.net/gitannexbuilder" - , "cd gitbuilder" + [ "git clone git://git.kitenet.net/gitannexbuilder " ++ builddir + , "cd " ++ builddir , "git checkout " ++ map toLower (show arch) , "git clone git://git-annex.branchable.com/ build" ] `describe` "gitbuilder setup" - , Cron.niceJob "gitannexbuilder" crontimes builduser "~/gitbuilder" "git pull ; ./autobuild" , check (lacksdir $ builddir "git-annex") $ userScriptProperty builduser - [ "cd gitbuilder" + [ "cd " ++ builddir , "git clone https://git-annex.branchable.com/ git-annex" ] + , 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 -- password used to upload the built image. -- cgit v1.2.3