From 1d0c3a2041676606c3a628dbcc7761fd62725610 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 Sep 2017 16:40:41 -0400 Subject: Borg: Fix handling of UseSshKey. --- debian/changelog | 1 + src/Propellor/Property/Borg.hs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 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 -- cgit v1.2.3