From afb7afee0ce011754e60f313b6929d1eadfcc701 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 30 Mar 2014 16:11:00 -0400 Subject: more description improvements --- Property/Ssh.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Property/Ssh.hs') 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 -- cgit v1.2.3