summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-01 18:31:04 -0400
committerJoey Hess2014-04-01 18:31:04 -0400
commit7200baa08a4b841cfc327030f5d66e1f36ac4a5d (patch)
tree1c9373b67a914ffd489bc762e15044f32892d259 /Propellor/Property
parent8bdc8d189cda9962f821d7955e41658488d81346 (diff)
propellor spin
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/SiteSpecific/GitAnnexBuilder.hs8
1 files changed, 4 insertions, 4 deletions
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.