summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Cron.hs
diff options
context:
space:
mode:
authorJoey Hess2017-07-13 12:31:20 -0400
committerJoey Hess2017-07-13 12:31:20 -0400
commitadffd9c76dec8de90407da98fb2c8e25c1d4e815 (patch)
tree151a36bf2448793a995283655873ed093681843d /src/Propellor/Property/Cron.hs
parent4a965c7b06b741b5de105e86d08228dfc9768ecc (diff)
parente952199fbe22af6e6c29a8c7d60c03cde685f63e (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Cron.hs')
-rw-r--r--src/Propellor/Property/Cron.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/Property/Cron.hs b/src/Propellor/Property/Cron.hs
index 0966a7e5..ab700a9d 100644
--- a/src/Propellor/Property/Cron.hs
+++ b/src/Propellor/Property/Cron.hs
@@ -80,7 +80,8 @@ niceJob desc times user cddir command = job desc times user cddir
-- | Installs a cron job to run propellor.
runPropellor :: Times -> Property UnixLike
-runPropellor times = withOS "propellor cron job" $ \w o ->
+runPropellor times = withOS "propellor cron job" $ \w o -> do
+ bootstrapper <- getBootstrapper
ensureProperty w $
niceJob "propellor" times (User "root") localdir
- (bootstrapPropellorCommand o ++ "; ./propellor")
+ (bootstrapPropellorCommand bootstrapper o ++ "; ./propellor")