From 756d5754a9dd3d9e90bdbf03916820bd26f61db7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 13 Apr 2014 03:28:53 -0400 Subject: propellor spin --- Propellor/Property/Ssh.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Propellor') diff --git a/Propellor/Property/Ssh.hs b/Propellor/Property/Ssh.hs index 426e286e..ba23253d 100644 --- a/Propellor/Property/Ssh.hs +++ b/Propellor/Property/Ssh.hs @@ -87,7 +87,7 @@ hostKey keytype = propertyList desc where desc = "known ssh host key (" ++ fromKeyType keytype ++ ")" install writer p ext = withPrivData p $ \key -> do - let f = "/etc/ssh/ssh_host_" ++ fromKeyType keytype ++ "key" ++ ext + let f = "/etc/ssh/ssh_host_" ++ fromKeyType keytype ++ "_key" ++ ext void $ liftIO $ writer f key noChange @@ -123,7 +123,7 @@ knownHost hosts hn user = Property desc $ desc = user ++ " knows ssh key for " ++ hn go (Just (Just k)) = do f <- liftIO $ dotFile "known_hosts" user - ensureProperty $ propertyList desc + ensureProperty $ combineProperties desc [ File.dirExists (takeDirectory f) , f `File.containsLine` (hn ++ " " ++ k) ] -- cgit v1.2.3