summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Postfix.hs
diff options
context:
space:
mode:
authorJoey Hess2015-02-01 14:50:54 -0400
committerJoey Hess2015-02-01 14:50:54 -0400
commit3c7c40dd67a48a81d19e24df8d2ca148ae553bd1 (patch)
tree2f3474949ea3f0ea5d1ff4d3f8fda51b856f18b9 /src/Propellor/Property/Postfix.hs
parentbcdc5754fce030fd9a7b213d46ffd27b502f398a (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property/Postfix.hs')
-rw-r--r--src/Propellor/Property/Postfix.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Propellor/Property/Postfix.hs b/src/Propellor/Property/Postfix.hs
index f37e179e..1e1a3a23 100644
--- a/src/Propellor/Property/Postfix.hs
+++ b/src/Propellor/Property/Postfix.hs
@@ -142,14 +142,16 @@ saslAuthdInstalled = setupdaemon
where
setupdaemon = "/etc/default/saslauthd" `File.containsLines`
[ "START=yes"
- , "OPTIONS=\"-c -m /var/spool/postfix/var/run/saslauthd\""
+ , "OPTIONS=\"-c -m " ++ dir ++ "\""
]
`onChange` Service.restarted "saslauthd"
smtpdconf = "/etc/postfix/sasl/smtpd.conf" `File.containsLines`
[ "pwcheck_method: saslauthd"
, "mech_list: PLAIN LOGIN"
]
- dirperm = cmdProperty "dpkg-statoverride"
- [ "--add", "root", "sasl", "710", "/var/spool/postfix/var/run/saslauthd"]
+ dirperm = check (not <$> doesDirectoryExist dir) $
+ cmdProperty "dpkg-statoverride"
+ [ "--add", "root", "sasl", "710", dir ]
postfixgroup = "postfix" `User.hasGroup` "sasl"
`onChange` restarted
+ dir = "/var/spool/postfix/var/run/saslauthd"