summaryrefslogtreecommitdiff
path: root/Propellor/Property/Ssh.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-13 11:14:43 -0400
committerJoey Hess2014-04-13 11:14:43 -0400
commit6d1263043112d0c70ae8d76fcbc998e6d853fafa (patch)
tree533205275f337f739c76a7cd1546888d378dc1d3 /Propellor/Property/Ssh.hs
parent622a3d8a931979deec838f06f7fb0311adf40df6 (diff)
propellor spin
Diffstat (limited to 'Propellor/Property/Ssh.hs')
-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 2fc3c560..cb3b9231 100644
--- a/Propellor/Property/Ssh.hs
+++ b/Propellor/Property/Ssh.hs
@@ -80,7 +80,7 @@ randomHostKeys = flagFile prop "/etc/ssh/.unique_host_keys"
--
-- (Uses a null username for host keys.)
hostKey :: SshKeyType -> Property
-hostKey keytype = propertyList desc
+hostKey keytype = combineProperties desc
[ Property desc (install writeFile (SshPubKey keytype "") ".pub")
, Property desc (install writeFileProtected (SshPrivKey keytype "") "")
]
@@ -97,7 +97,7 @@ hostKey keytype = propertyList desc
-- | Sets up a user with a ssh private key and public key pair
-- from the site's PrivData.
keyImported :: SshKeyType -> UserName -> Property
-keyImported keytype user = propertyList desc
+keyImported keytype user = combineProperties desc
[ Property desc (install writeFile (SshPubKey keytype user) ".pub")
, Property desc (install writeFileProtected (SshPrivKey keytype user) "")
]