From 53b07dbc6268a108b9760f9c7318e3df4ca436f8 Mon Sep 17 00:00:00 2001 From: Mario Lang Date: Thu, 10 Sep 2015 19:15:20 +0200 Subject: Fix two typos. --- src/Propellor/Property/Ssh.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index c85694db..005ab618 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -122,7 +122,7 @@ randomHostKeys = flagFile prop "/etc/ssh/.unique_host_keys" -- -- The corresponding private keys come from the privdata. -- --- Any host keysthat are not in the list are removed from the host. +-- Any host keys that are not in the list are removed from the host. hostKeys :: IsContext c => c -> [(SshKeyType, PubKeyText)] -> Property HasInfo hostKeys ctx l = propertyList desc $ catMaybes $ map (\(t, pub) -> Just $ hostKey ctx t pub) l ++ [cleanup] -- cgit v1.2.3 From 8c6e1c2cec1f69b43b63a4e4f8974b3e1948bf1d Mon Sep 17 00:00:00 2001 From: Mario Lang Date: Thu, 10 Sep 2015 19:18:38 +0200 Subject: Simplify Propellor.Property.Ssh.pubKey. --- src/Propellor/Property/Ssh.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index 005ab618..5f0082cb 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -172,8 +172,7 @@ keyFile keytype ispub = "/etc/ssh/ssh_host_" ++ fromKeyType keytype ++ "_key" ++ -- configure the host to use it. Normally this does not need to be used; -- use 'hostKey' instead. pubKey :: SshKeyType -> PubKeyText -> Property HasInfo -pubKey t k = pureInfoProperty ("ssh pubkey known") - (SshPubKeyInfo (M.singleton t k)) +pubKey t = pureInfoProperty "ssh pubkey known" . SshPubKeyInfo . M.singleton t getPubKey :: Propellor (M.Map SshKeyType PubKeyText) getPubKey = fromSshPubKeyInfo <$> askInfo -- cgit v1.2.3