From 402b6b4a0b78142cb3cdc566b91b3a6fd1fe091b Mon Sep 17 00:00:00 2001 From: FĂ©lix Sipma Date: Mon, 14 Dec 2015 19:13:20 +0100 Subject: User: systemAccountFor and systemAccountFor' (cherry picked from commit f56f9696a998d32d6d5c4eca29b28ee60def2db0) --- src/Propellor/Property/User.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Propellor/Property/User.hs b/src/Propellor/Property/User.hs index aef9ee57..c9c91a77 100644 --- a/src/Propellor/Property/User.hs +++ b/src/Propellor/Property/User.hs @@ -18,11 +18,11 @@ accountFor user@(User u) = check nohomedir go , u ] -simpleSystemAccount :: User -> Property NoInfo -simpleSystemAccount u = systemAccountFor u Nothing (Just (Group "nogroup")) +systemAccountFor :: User -> Property NoInfo +systemAccountFor user@(User u) = systemAccountFor' user Nothing (Just (Group u)) -systemAccountFor :: User -> Maybe FilePath -> Maybe Group -> Property NoInfo -systemAccountFor (User u) mhome mgroup = check nouser go +systemAccountFor' :: User -> Maybe FilePath -> Maybe Group -> Property NoInfo +systemAccountFor' (User u) mhome mgroup = check nouser go `describe` ("system account for " ++ u) where nouser = isNothing <$> catchMaybeIO (getUserEntryForName u) -- cgit v1.2.3