All Property combinators now combine together their Attr settings.

So Attr settings can be made inside a propertyList, for example.

1 files changed, 2 insertions, 2 deletions

diff --git a/Propellor/Attr.hs b/Propellor/Attr.hs
index d4fb25d2..03c882cc 100644
--- a/Propellor/Attr.hs
+++ b/Propellor/Attr.hs
@@ -10,7 +10,7 @@ import qualified Data.Set as S
 import qualified Data.Map as M
 import Control.Applicative
 
-pureAttrProperty :: Desc -> (Attr -> Attr) -> Property 
+pureAttrProperty :: Desc -> SetAttr -> Property 
 pureAttrProperty desc = Property ("has " ++ desc) (return NoChange)
 
 hostname :: HostName -> Property
@@ -35,7 +35,7 @@ cnameFor domain mkp =
 	let p = mkp domain
 	in p { propertyAttr = propertyAttr p . addCName domain }
 
-addCName :: HostName -> Attr -> Attr
+addCName :: HostName -> SetAttr
 addCName domain d = d { _cnames = S.insert domain (_cnames d) }
 
 sshPubKey :: String -> Property