diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-17 17:02:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-17 17:02:47 -0400 |
| commit | 2fab1a08b4f197874ad6c613f118315ab0d474a3 (patch) | |
| tree | 025353fea85436242bb706cd75914d85c3fca98f /src/Propellor/Property/Obnam.hs | |
| parent | 90f5cff061e11a06d3f37fdd5424b49678a2b07d (diff) | |
| parent | fbd8ea3b3d46b8cb56f3b9c82847cc849a37f89d (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Obnam.hs')
| -rw-r--r-- | src/Propellor/Property/Obnam.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Propellor/Property/Obnam.hs b/src/Propellor/Property/Obnam.hs index e18ca3f9..4dc895ef 100644 --- a/src/Propellor/Property/Obnam.hs +++ b/src/Propellor/Property/Obnam.hs @@ -48,8 +48,10 @@ backup dir crontimes params numclients = -- into root's keyring using Propellor.Property.Gpg.keyImported backupEncrypted :: FilePath -> Cron.CronTimes -> [ObnamParam] -> NumClients -> Gpg.GpgKeyId -> Property backupEncrypted dir crontimes params numclients keyid = - backup dir crontimes (("--encrypt-with=" ++ keyid):params) numclients + backup dir crontimes params' numclients `requires` Gpg.keyImported keyid "root" + where + params' = ("--encrypt-with=" ++ Gpg.getGpgKeyId keyid) : params -- | Does a backup, but does not automatically restore. backup' :: FilePath -> Cron.CronTimes -> [ObnamParam] -> NumClients -> Property |