summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Ssh.hs
diff options
context:
space:
mode:
authorJoey Hess2015-02-10 20:56:57 -0400
committerJoey Hess2015-02-10 20:56:57 -0400
commit0119bf8531076265aee3bf99cdf081b8425f0e57 (patch)
treeb51c2117bab4510cf852cd957cbc17cda67a98dd /src/Propellor/Property/Ssh.hs
parentd08c98d8b33cab9c7008ee36ff88950c96af2e38 (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property/Ssh.hs')
-rw-r--r--src/Propellor/Property/Ssh.hs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs
index d9cf9a48..fe2794a5 100644
--- a/src/Propellor/Property/Ssh.hs
+++ b/src/Propellor/Property/Ssh.hs
@@ -161,7 +161,12 @@ keyImported' dest keytype user context = combineProperties desc
, installkey (SshPrivKey keytype user) (install writeFileProtected "")
]
where
- desc = user ++ " has ssh key (" ++ fromKeyType keytype ++ ")"
+ desc = unwords $ catMaybes
+ [ Just user
+ , Just "has ssh key"
+ , dest
+ , Just $ "(" ++ fromKeyType keytype ++ ")"
+ ]
installkey p a = withPrivData p context $ \getkey ->
property desc $ getkey a
install writer ext key = do