Merge branch 'joeyconfig'

2 files changed, 13 insertions, 6 deletions

diff --git a/Propellor/Property/Cron.hs b/Propellor/Property/Cron.hs
index 2fa9c87e..71580bc3 100644
--- a/Propellor/Property/Cron.hs
+++ b/Propellor/Property/Cron.hs
@@ -3,14 +3,19 @@ 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 specificed user, in a particular
---directory. Note that the Desc must be unique, as it is used for the 
---cron.d/ filename.
+-- | 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.
 job :: Desc -> CronTimes -> UserName -> FilePath -> String -> Property
 job desc times user cddir command = cronjobfile `File.hasContent`
 	[ "# Generated by propellor"
@@ -18,11 +23,14 @@ job desc times user cddir command = cronjobfile `File.hasContent`
 	, "SHELL=/bin/sh"
 	, "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 	, ""
-	, times ++ "\t" ++ user ++ "\t" ++ "cd " ++ cddir ++ " && " ++ command
+	, times ++ "\t" ++ user ++ "\t"
+		++ "flock -n " ++ shellEscape cronjobfile
+		++ " sh -c " ++ shellEscape cmdline
 	]
 	`requires` Apt.serviceInstalledRunning "cron"
 	`describe` ("cronned " ++ desc)
   where
+	cmdline = "cd " ++ cddir ++ " && " ++ command
 	cronjobfile = "/etc/cron.d/" ++ map sanitize desc
 	sanitize c
 		| isAlphaNum c = c
diff --git a/Propellor/Property/Obnam.hs b/Propellor/Property/Obnam.hs
index 1e861588..00e0bbef 100644
--- a/Propellor/Property/Obnam.hs
+++ b/Propellor/Property/Obnam.hs
@@ -46,7 +46,7 @@ backup dir crontimes params numclients = cronjob `describe` desc
   where
 	desc = dir ++ " backed up by obnam"
 	cronjob = Cron.niceJob ("obnam_backup" ++ dir) crontimes "root" "/" $
-		intercalate ";" $ map flockcmd $ catMaybes
+		intercalate ";" $ catMaybes
 			[ if numclients == OnlyClient
 				then Just $ unwords $
 					[ "obnam"
@@ -59,7 +59,6 @@ backup dir crontimes params numclients = cronjob `describe` desc
 				, shellEscape dir
 				] ++ map shellEscape params
 			]
-	flockcmd cmd = "flock -n " ++ shellEscape dir ++ " " ++ cmd
 
 -- | Restores a directory from an obnam backup.
 --