cron job setup Properties

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"