diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-10 17:13:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-10 17:13:09 -0400 |
| commit | 934cca5cd613a70e7eee5a8865d846efb544dfb7 (patch) | |
| tree | 4380fc88b1a04945dfaec9b231421db6bcdbf643 | |
| parent | 189b67a5dac97dd6654488bf38d1f12e48f407e1 (diff) | |
| parent | 8c6e1c2cec1f69b43b63a4e4f8974b3e1948bf1d (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Ssh.hs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 8b02e942..fd3e4f63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,7 +80,7 @@ propellor (2.5.0) unstable; urgency=medium * Add docker image related properties. Thanks, Antoine Eiche. * Export CommandParam, boolSystem, safeSystem, shellEscape, and - * createProcess from Propellor.Property.Cmd, so they are available + createProcess from Propellor.Property.Cmd, so they are available for use in constricting your own Properties when using propellor as a library. * Improve enter-machine scripts for systemd-nspawn containers to unset most diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index c85694db..5f0082cb 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] @@ -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 |