From 0119bf8531076265aee3bf99cdf081b8425f0e57 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 Feb 2015 20:56:57 -0400 Subject: propellor spin --- src/Propellor/Property/Ssh.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Property/Ssh.hs') 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 -- cgit v1.2.3