summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Lang2015-09-10 19:15:20 +0200
committerJoey Hess2015-09-10 13:50:38 -0400
commit53b07dbc6268a108b9760f9c7318e3df4ca436f8 (patch)
treeaec07dc54851a4a276e3e3a6144510db874da8da
parenta4069a52fc94e3b906eff7f29af10f36a5b7f8f8 (diff)
Fix two typos.
-rw-r--r--debian/changelog2
-rw-r--r--src/Propellor/Property/Ssh.hs2
2 files changed, 2 insertions, 2 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..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]