summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Postfix.hs
diff options
context:
space:
mode:
authorJoey Hess2015-12-05 18:51:17 -0400
committerJoey Hess2015-12-05 18:51:17 -0400
commit4fe1dcb6142d4033482d6f25b916b64926bc7b3f (patch)
treefd8597ccbb3c591e118da4edaa8da650f075f3bf /src/Propellor/Property/Postfix.hs
parent97a224b194b96184c7938de0bb1e1f423612ccbc (diff)
parent5cfb20668421acb3c0de133afe973fc693b8b320 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Postfix.hs')
-rw-r--r--src/Propellor/Property/Postfix.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Property/Postfix.hs b/src/Propellor/Property/Postfix.hs
index 782e7f45..bc46ac21 100644
--- a/src/Propellor/Property/Postfix.hs
+++ b/src/Propellor/Property/Postfix.hs
@@ -32,7 +32,7 @@ satellite :: Property NoInfo
satellite = check (not <$> mainCfIsSet "relayhost") setup
`requires` installed
where
- setup = trivial $ property "postfix satellite system" $ do
+ setup = property "postfix satellite system" $ do
hn <- asks hostName
let (_, domain) = separate (== '.') hn
ensureProperties
@@ -181,3 +181,4 @@ saslPasswdSet domain (User user) = withPrivData src ctx $ \getpw -> trivial $
p = proc "saslpasswd2" ps
ctx = Context "sasl"
src = PrivDataSource (Password uatd) "enter password"
+ trivial = flip assume NoChange