summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-04-13 03:28:53 -0400
committerJoey Hess2014-04-13 03:28:53 -0400
commit756d5754a9dd3d9e90bdbf03916820bd26f61db7 (patch)
treeca3cd972f0623fc26ba75346c1d7f0d663aa9df9 /Propellor
parent427246db6a6dc1d626297cf0af6f372a3c75486f (diff)
propellor spin
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/Property/Ssh.hs4
1 files changed, 2 insertions, 2 deletions
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)
]