From 7115d1ec162b4059b3e8e8f84bd8d5898c1db025 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 14 May 2014 19:41:05 -0400 Subject: moved source code to src This is to work around OSX's brain-damange regarding filename case insensitivity. Avoided moving config.hs, because it's a config file. Put in a symlink to make build work. --- Propellor/Property/Cron.hs | 49 ---------------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 Propellor/Property/Cron.hs (limited to 'Propellor/Property/Cron.hs') diff --git a/Propellor/Property/Cron.hs b/Propellor/Property/Cron.hs deleted file mode 100644 index 5b070eff..00000000 --- a/Propellor/Property/Cron.hs +++ /dev/null @@ -1,49 +0,0 @@ -module Propellor.Property.Cron where - -import Propellor -import qualified Propellor.Property.File as File -import qualified Propellor.Property.Apt as Apt -import Utility.SafeCommand - -import Data.Char - -type CronTimes = String - --- | Installs a cron job, run as a specified user, in a particular --- directory. Note that the Desc must be unique, as it is used for the --- cron.d/ filename. --- --- Only one instance of the cron job is allowed to run at a time, no matter --- how long it runs. This is accomplished using flock locking of the cron --- job file. --- --- The cron job's output will only be emailed if it exits nonzero. -job :: Desc -> CronTimes -> UserName -> FilePath -> String -> Property -job desc times user cddir command = cronjobfile `File.hasContent` - [ "# Generated by propellor" - , "" - , "SHELL=/bin/sh" - , "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" - , "" - , times ++ "\t" ++ user ++ "\t" - ++ "chronic flock -n " ++ shellEscape cronjobfile - ++ " sh -c " ++ shellEscape cmdline - ] - `requires` Apt.serviceInstalledRunning "cron" - `requires` Apt.installed ["util-linux", "moreutils"] - `describe` ("cronned " ++ desc) - where - cmdline = "cd " ++ cddir ++ " && ( " ++ command ++ " )" - cronjobfile = "/etc/cron.d/" ++ map sanitize desc - sanitize c - | isAlphaNum c = c - | otherwise = '_' - --- | 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) - --- | Installs a cron job to run propellor. -runPropellor :: CronTimes -> Property -runPropellor times = niceJob "propellor" times "root" localdir "make" -- cgit v1.2.3