From 90efcd3203d64c2c5691e30ccc23307aae8d20c8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 30 Mar 2014 15:31:57 -0400 Subject: refactor --- Property/Ssh.hs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'Property/Ssh.hs') diff --git a/Property/Ssh.hs b/Property/Ssh.hs index 98149bcb..1b0a6c53 100644 --- a/Property/Ssh.hs +++ b/Property/Ssh.hs @@ -1,14 +1,8 @@ module Property.Ssh where -import Control.Applicative -import Control.Monad -import System.FilePath - -import Property -import Property.User +import Common import qualified Property.File as File -import Utility.SafeCommand -import Utility.Exception +import Property.User sshBool :: Bool -> String sshBool True = "yes" @@ -48,7 +42,7 @@ uniqueHostKeys :: Property uniqueHostKeys = flagFile prop "/etc/ssh/.unique_host_keys" `onChange` restartSshd where - prop = IOProperty "ssh unique host keys" $ do + prop = Property "ssh unique host keys" $ do void $ boolSystem "sh" [ Param "-c" , Param "rm -f /etc/ssh/ssh_host_*" -- cgit v1.2.3