From 434b3e8b325be7cd04c4130e80be19dc57f27d0f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Mar 2016 04:48:06 -0400 Subject: last withOS that can be converted to pickOS is converted --- src/Propellor/Property/Ssh.hs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index 369999b7..6e1690d2 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -48,12 +48,10 @@ import qualified Data.Set as S import Data.List installed :: Property UnixLike -installed = withOS "ssh installed" $ \w o -> - let aptinstall = ensureProperty w $ Apt.installed ["ssh"] - in case o of - (Just (System (Debian _) _)) -> aptinstall - (Just (System (Buntish _) _)) -> aptinstall - _ -> unsupportedOS' +installed = "ssh installed" ==> (aptinstall `pickOS` unsupportedOS) + where + aptinstall :: Property DebianLike + aptinstall = Apt.installed ["ssh"] restarted :: Property DebianLike restarted = Service.restarted "ssh" -- cgit v1.2.3