summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs2
-rw-r--r--src/Propellor/Property/User.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 3df6ae60..e893917f 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -98,7 +98,7 @@ clam :: Host
clam = host "clam.kitenet.net" $ props
& standardSystem (Stable "stretch") X86_64
["Unreliable server. Anything here may be lost at any time!" ]
- & ipv4 "167.114.76.178"
+ & ipv4 "178.33.208.168"
& User.hasPassword (User "root")
& Ssh.hostKeys hostContext
diff --git a/src/Propellor/Property/User.hs b/src/Propellor/Property/User.hs
index 0b5bdddc..f6bc2c4b 100644
--- a/src/Propellor/Property/User.hs
+++ b/src/Propellor/Property/User.hs
@@ -168,7 +168,7 @@ hasDesktopGroups user@(User u) = property' desc $ \o -> do
existinggroups <- map (fst . break (== ':')) . lines
<$> liftIO (readFile "/etc/group")
let toadd = filter (`elem` existinggroups) desktopgroups
- ensureProperty o $ propertyList desc $ toProps $
+ ensureProperty o $ combineProperties desc $ toProps $
map (hasGroup user . Group) toadd
where
desc = "user " ++ u ++ " is in standard desktop groups"