summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2019-04-03 17:00:00 -0400
committerJoey Hess2019-04-03 17:00:00 -0400
commit9972ae012f63ce38bd925e390a6eeab25094efe1 (patch)
tree030c8d97a84c1dce4344f589f907fab9392fd93d /src
parent52098bf9c56a411acd53cc7a5b60abbeec576574 (diff)
parentc3e6ea8701a01480c395f0094fed79b6f1ef415d (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Cron.hs85
1 files changed, 59 insertions, 26 deletions
diff --git a/src/Propellor/Property/Cron.hs b/src/Propellor/Property/Cron.hs
index 0271b0b3..cac0b78d 100644
--- a/src/Propellor/Property/Cron.hs
+++ b/src/Propellor/Property/Cron.hs
@@ -1,4 +1,10 @@
-module Propellor.Property.Cron where
+module Propellor.Property.Cron (
+ Times(..),
+ job,
+ niceJob,
+ jobDropped,
+ Propellor.Property.Cron.runPropellor
+) where
import Propellor.Base
import qualified Propellor.Property.File as File
@@ -30,7 +36,7 @@ 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`
+ & cronjobfile desc times `File.hasContent`
[ case times of
Times _ -> ""
_ -> "#!/bin/sh\nset -e"
@@ -40,37 +46,40 @@ job desc times (User u) cddir command = combineProperties ("cronned " ++ desc) $
, "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
, ""
, case times of
- Times t -> t ++ "\t" ++ u ++ "\tchronic " ++ shellEscape scriptfile
+ Times t -> t ++ "\t" ++ u ++ "\tchronic "
+ ++ shellEscape (scriptfile desc)
_ -> case u of
- "root" -> "chronic " ++ shellEscape scriptfile
- _ -> "chronic su " ++ u ++ " -c " ++ shellEscape scriptfile
+ "root" -> "chronic " ++ shellEscape (scriptfile desc)
+ _ -> "chronic su " ++ u ++ " -c "
+ ++ shellEscape (scriptfile desc)
]
& case times of
Times _ -> doNothing
- _ -> cronjobfile `File.mode` combineModes (readModes ++ executeModes)
+ _ -> (cronjobfile desc times)
+ `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 desc `File.hasContent`
[ "#!/bin/sh"
, "# Generated by propellor"
, "set -e"
- , "flock -n " ++ shellEscape cronjobfile
+ , "flock -n " ++ shellEscape (cronjobfile desc times)
++ " sh -c " ++ shellEscape cmdline
]
- & scriptfile `File.mode` combineModes (readModes ++ executeModes)
+ & scriptfile desc `File.mode` combineModes (readModes ++ executeModes)
where
cmdline = "cd " ++ cddir ++ " && ( " ++ command ++ " )"
- cronjobfile = "/etc" </> cronjobdir </> name
- cronjobdir = case times of
- Times _ -> "cron.d"
- Daily -> "cron.daily"
- Weekly -> "cron.weekly"
- Monthly -> "cron.monthly"
- scriptfile = "/usr/local/bin/" ++ name ++ "_cronjob"
- name = map sanitize desc
- sanitize c
- | isAlphaNum c = c
- | otherwise = '_'
+
+-- | Removes a cron job created by 'job' or 'niceJob', as identified by the
+-- 'Desc' passed to those properties when the cronjob was set up
+--
+-- Those properties are not revertable because simply removing a cronjob does
+-- not undo the changes it might have made to the system, i.e., 'jobDropped' is
+-- not in the general case a reversion of 'job' or 'niceJob'
+jobDropped :: Desc -> Times -> Property UnixLike
+jobDropped desc times = combineProperties ("uncronned " ++ desc) $ props
+ & File.notPresent (scriptfile desc)
+ & File.notPresent (cronjobfile desc times)
-- | Installs a cron job, and runs it niced and ioniced.
niceJob :: Desc -> Times -> User -> FilePath -> String -> Property DebianLike
@@ -78,9 +87,33 @@ 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 DebianLike
-runPropellor times = withOS "propellor cron job" $ \w o -> do
- bootstrapper <- getBootstrapper
- ensureProperty w $
- niceJob "propellor" times (User "root") localdir
- (bootstrapPropellorCommand bootstrapper o ++ "; ./propellor")
+runPropellor :: Times -> RevertableProperty DebianLike UnixLike
+runPropellor times = cronned <!> uncronned
+ where
+ cronned = withOS "propellor cron job" $ \w o -> do
+ bootstrapper <- getBootstrapper
+ ensureProperty w $
+ niceJob "propellor" times (User "root") localdir
+ (bootstrapPropellorCommand bootstrapper o ++ "; ./propellor")
+ uncronned = jobDropped "propellor" times
+
+-- Utility functions
+
+cronjobname :: Desc -> String
+cronjobname d = map sanitize d
+ where
+ sanitize c
+ | isAlphaNum c = c
+ | otherwise = '_'
+
+scriptfile :: Desc -> FilePath
+scriptfile d = "/usr/local/bin/" ++ (cronjobname d) ++ "_cronjob"
+
+cronjobfile :: Desc -> Times -> FilePath
+cronjobfile d times = "/etc" </> cronjobdir </> (cronjobname d)
+ where
+ cronjobdir = case times of
+ Times _ -> "cron.d"
+ Daily -> "cron.daily"
+ Weekly -> "cron.weekly"
+ Monthly -> "cron.monthly"