From 3c7c40dd67a48a81d19e24df8d2ca148ae553bd1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Feb 2015 14:50:54 -0400 Subject: propellor spin --- src/Propellor/Property/Postfix.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property') 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" -- cgit v1.2.3