Merge branch 'joeyconfig'

1 files changed, 12 insertions, 13 deletions

diff --git a/src/Propellor/Property/Cron.hs b/src/Propellor/Property/Cron.hs
index 365e2903..0966a7e5 100644
--- a/src/Propellor/Property/Cron.hs
+++ b/src/Propellor/Property/Cron.hs
@@ -27,9 +27,11 @@ data Times
 -- job file.
 --
 -- The cron job's output will only be emailed if it exits nonzero.
-job :: Desc -> Times -> User -> FilePath -> String -> Property NoInfo
-job desc times (User u) cddir command = combineProperties ("cronned " ++ desc)
-	[ cronjobfile `File.hasContent`
+job :: Desc -> Times -> User -> FilePath -> String -> Property DebianLike
+job desc times (User u) cddir command = combineProperties ("cronned " ++ desc) $ props
+	& Apt.serviceInstalledRunning "cron"
+	& Apt.installed ["util-linux", "moreutils"]
+	& cronjobfile `File.hasContent`
 		[ case times of
 			Times _ -> ""
 			_ -> "#!/bin/sh\nset -e"
@@ -44,22 +46,19 @@ job desc times (User u) cddir command = combineProperties ("cronned " ++ desc)
 				"root" -> "chronic " ++ shellEscape scriptfile
 				_ -> "chronic su " ++ u ++ " -c " ++ shellEscape scriptfile
 		]
-	, case times of
+	& case times of
 		Times _ -> doNothing
 		_ -> cronjobfile `File.mode` combineModes (readModes ++ executeModes)
 	-- Use a separate script because it makes the cron job name
 	-- prettier in emails, and also allows running the job manually.
-	, scriptfile `File.hasContent`
+	& scriptfile `File.hasContent`
 		[ "#!/bin/sh"
 		, "# Generated by propellor"
 		, "set -e"
 		, "flock -n " ++ shellEscape cronjobfile
 			++ " sh -c " ++ shellEscape cmdline
 		]
-	, scriptfile `File.mode` combineModes (readModes ++ executeModes)
-	]
-	`requires` Apt.serviceInstalledRunning "cron"
-	`requires` Apt.installed ["util-linux", "moreutils"]
+	& scriptfile `File.mode` combineModes (readModes ++ executeModes)
   where
 	cmdline = "cd " ++ cddir ++ " && ( " ++ command ++ " )"
 	cronjobfile = "/etc" </> cronjobdir </> name
@@ -75,13 +74,13 @@ job desc times (User u) cddir command = combineProperties ("cronned " ++ desc)
 		| otherwise = '_'
 
 -- | Installs a cron job, and runs it niced and ioniced.
-niceJob :: Desc -> Times -> User -> FilePath -> String -> Property NoInfo
+niceJob :: Desc -> Times -> User -> FilePath -> String -> Property DebianLike
 niceJob desc times user cddir command = job desc times user cddir
 	("nice ionice -c 3 sh -c " ++ shellEscape command)
 
 -- | Installs a cron job to run propellor.
-runPropellor :: Times -> Property NoInfo
-runPropellor times = withOS "propellor cron job" $ \o -> 
-	ensureProperty $
+runPropellor :: Times -> Property UnixLike
+runPropellor times = withOS "propellor cron job" $ \w o -> 
+	ensureProperty w $
 		niceJob "propellor" times (User "root") localdir
 			(bootstrapPropellorCommand o ++ "; ./propellor")