diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-09-25 16:40:46 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-25 16:40:46 -0400 |
| commit | 8879f3aa1d954c09e0e818b5eca67a1e120e4b1b (patch) | |
| tree | c2a85a8af45c934d57166ca6ce4eaa57be8aa7f9 | |
| parent | ee300295ddaad2bb1792e1a626b856760464177e (diff) | |
| parent | 1d0c3a2041676606c3a628dbcc7761fd62725610 (diff) | |
Merge branch 'master' into joeyconfig
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | src/Propellor/Property/Borg.hs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d8c251dc..48462e89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ propellor (4.8.1) UNRELEASED; urgency=medium * Borg: Fix propigation of exit status of borg backup. + * Borg: Fix handling of UseSshKey. -- Joey Hess <id@joeyh.name> Mon, 25 Sep 2017 16:38:17 -0400 diff --git a/src/Propellor/Property/Borg.hs b/src/Propellor/Property/Borg.hs index e95ea87f..989fb4b9 100644 --- a/src/Propellor/Property/Borg.hs +++ b/src/Propellor/Property/Borg.hs @@ -52,7 +52,7 @@ runBorgEnv :: BorgRepo -> [(String, String)] runBorgEnv (BorgRepo _) = [] runBorgEnv (BorgRepoUsing os _) = map go os where - go (UseSshKey k) = ("BORG_RSH", k) + go (UseSshKey k) = ("BORG_RSH", "ssh -i " ++ k) installed :: Property DebianLike installed = withOS desc $ \w o -> case o of |