summaryrefslogtreecommitdiff
path: root/Property
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 16:11:00 -0400
committerJoey Hess2014-03-30 16:11:00 -0400
commitafb7afee0ce011754e60f313b6929d1eadfcc701 (patch)
treefd2a50f5069fd0e0449fb68e769b0db184a6f3a5 /Property
parent4d33b25ba37d7dd91ffeb44b185d24d09f3c1320 (diff)
more description improvements
Diffstat (limited to 'Property')
-rw-r--r--Property/Ssh.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/Property/Ssh.hs b/Property/Ssh.hs
index 1b0a6c53..c726bedd 100644
--- a/Property/Ssh.hs
+++ b/Property/Ssh.hs
@@ -12,12 +12,13 @@ sshdConfig :: FilePath
sshdConfig = "/etc/ssh/sshd_config"
setSshdConfig :: String -> Bool -> Property
-setSshdConfig setting allowed = combineProperties desc
+setSshdConfig setting allowed = combineProperties
[ sshdConfig `File.lacksLine` (sshline $ not allowed)
, sshdConfig `File.containsLine` (sshline allowed)
- ] `onChange` restartSshd
+ ]
+ `onChange` restartSshd
+ `describe` unwords [ "ssh config:", setting, sshBool allowed ]
where
- desc = unwords [ "ssh config:", setting, sshBool allowed ]
sshline v = setting ++ " " ++ sshBool v
permitRootLogin :: Bool -> Property