cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-17 19:32:23 -04:00
parent 763c65b84f ecf10abc47
commit 312a9c3fc9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Propellor/Property/Obnam.hs
View File

@ -46,7 +46,7 @@ backup dir crontimes params numclients = cronjob `describe` desc
where where
desc = dir ++ " backed up by obnam" desc = dir ++ " backed up by obnam"
cronjob = Cron.niceJob ("obnam_backup" ++ dir) crontimes "root" "/" $ cronjob = Cron.niceJob ("obnam_backup" ++ dir) crontimes "root" "/" $
intercalate ";" $ catMaybes intercalate ";" $ map flockcmd $ catMaybes
[ if numclients == OnlyClient [ if numclients == OnlyClient
then Just $ unwords $ then Just $ unwords $
[ "obnam" [ "obnam"
@ -59,6 +59,7 @@ backup dir crontimes params numclients = cronjob `describe` desc
, shellEscape dir , shellEscape dir
] ++ map shellEscape params ] ++ map shellEscape params
] ]
flockcmd cmd = "flock -n " ++ shellEscape dir ++ " " ++ cmd
-- | Restores a directory from an obnam backup. -- | Restores a directory from an obnam backup.
-- --