summaryrefslogtreecommitdiff
path: root/Propellor/Attr.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-18 04:48:49 -0400
committerJoey Hess2014-04-18 04:48:49 -0400
commit5f6c3ad56490a8c3063f8daa1cd8b0a302b63ddd (patch)
treea05856a744c7ce6a6be69db327e5b8afec013257 /Propellor/Attr.hs
parent4e4fb9ab7ca13f5148c6d4b08f53f518429530a8 (diff)
All Property combinators now combine together their Attr settings.
So Attr settings can be made inside a propertyList, for example.
Diffstat (limited to 'Propellor/Attr.hs')
-rw-r--r--Propellor/Attr.hs4
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