summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-01 17:54:20 -0400
committerJoey Hess2014-04-01 17:54:20 -0400
commit0dc5c271809187549c937d9d65e39a368ce06acb (patch)
tree437ca9db30d894cea219771fdcab94704caf2f03 /Propellor/Property
parentb70422c8cfb082687eaa6d4051c27d430c24f36b (diff)
cron job setup Properties
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/Cron.hs26
1 files changed, 19 insertions, 7 deletions
diff --git a/Propellor/Property/Cron.hs b/Propellor/Property/Cron.hs
index 10e28ed7..982d6fec 100644
--- a/Propellor/Property/Cron.hs
+++ b/Propellor/Property/Cron.hs
@@ -6,15 +6,27 @@ import qualified Propellor.Property.Apt as Apt
type CronTimes = String
--- | Installs a cron job to run propellor.
-runPropellor :: CronTimes -> Property
-runPropellor times = "/etc/cron.d/propellor" `File.hasContent`
- [ "# Run propellor"
+-- | Installs a cron job, run as a specificed user, in a particular
+--directory. Note that the Desc must be unique, as it is used for the
+--cron.d/ filename.
+job :: Desc -> CronTimes -> UserName -> FilePath -> String -> Property
+job desc times user cddir command = ("/etc/cron.d/" ++ desc) `File.hasContent`
+ [ "# Generated by propellor"
, ""
, "SHELL=/bin/sh"
, "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
, ""
- , times ++ "\troot\tcd " ++ localdir ++ " && nice ionice -c 3 chronic make"
+ , times ++ "\t" ++ user ++ "\t" ++ "cd " ++ cddir ++ " && " ++ command
]
- `requires` Apt.installed ["util-linux", "cron", "moreutils"]
- `describe` "cronned propeller"
+ `requires` Apt.installed ["cron"]
+ `describe` ("cronned " ++ desc)
+
+-- | Installs a cron job, and runs it niced and ioniced.
+niceJob :: Desc -> CronTimes -> UserName -> FilePath -> String -> Property
+niceJob desc times user cddir command = job desc times user cddir
+ ("nice ionice -c 3 " ++ command)
+ `requires` Apt.installed ["util-linux", "moreutils"]
+
+-- | Installs a cron job to run propellor.
+runPropellor :: CronTimes -> Property
+runPropellor times = niceJob "propellor" times "root" localdir "chronic make"