diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-28 04:48:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-28 04:48:06 -0400 |
| commit | 434b3e8b325be7cd04c4130e80be19dc57f27d0f (patch) | |
| tree | 025493ab10df04272da16b061a7554330d5f6329 /src | |
| parent | 5f41492d8afe6ac6ee3cc280c3e2f252bcc91817 (diff) | |
last withOS that can be converted to pickOS is converted
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Ssh.hs | 10 |
1 files 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" |