From 8e7b296e820e7513c7846ceeb3fbd87d60bc95f4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 30 Mar 2014 13:12:33 -0400 Subject: split out Property.FIle --- Property/Ssh.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Property/Ssh.hs') diff --git a/Property/Ssh.hs b/Property/Ssh.hs index 141e3495..98149bcb 100644 --- a/Property/Ssh.hs +++ b/Property/Ssh.hs @@ -6,6 +6,7 @@ import System.FilePath import Property import Property.User +import qualified Property.File as File import Utility.SafeCommand import Utility.Exception @@ -18,8 +19,8 @@ sshdConfig = "/etc/ssh/sshd_config" setSshdConfig :: String -> Bool -> Property setSshdConfig setting allowed = combineProperties desc - [ lineNotInFile sshdConfig $ sshline (not allowed) - , lineInFile sshdConfig $ sshline allowed + [ sshdConfig `File.lacksLine` (sshline $ not allowed) + , sshdConfig `File.containsLine` (sshline allowed) ] `onChange` restartSshd where desc = unwords [ "ssh config:", setting, sshBool allowed ] -- cgit v1.3-2-g0d8e