From 0ea97943246f44a3a2b32c6bc67a1f40b97103b7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Feb 2015 15:08:30 -0400 Subject: propellor spin --- src/Propellor/Property/Postfix.hs | 3 ++- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/Postfix.hs b/src/Propellor/Property/Postfix.hs index 1e1a3a23..0abd783e 100644 --- a/src/Propellor/Property/Postfix.hs +++ b/src/Propellor/Property/Postfix.hs @@ -127,7 +127,8 @@ dedupCf ls = Just n | n > 1 -> dedup c (M.insert k (n - 1) kc) rest _ -> dedup (fmt k v:c) kc rest --- | Installs saslauthd and configures it for postfix. +-- | Installs saslauthd and configures it for postfix, authenticating +-- against PAM. -- -- Does not configure postfix to use it; eg smtpd_sasl_auth_enable = yes -- needs to be set to enable use. See diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 0d4687e7..a3413d67 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -518,8 +518,6 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props , "# Password auth for relaying (used by errol)" , "smtpd_sasl_auth_enable = yes" - , "smtpd_sasl_type = dovecot" - , "smtpd_sasl_path = private/auth" , "smtpd_sasl_security_options = noanonymous" , "smtpd_sasl_local_domain = kitenet.net" -- cgit v1.2.3