summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-04-04 16:46:38 -0400
committerJoey Hess2017-04-04 16:46:38 -0400
commitf5792b970bdda5911fa02d94cb0feab0a82cbc1d (patch)
tree7321fd53a564adfca5925bdbdf7d3b157de6d058
parent680f67970dcb25fac43e96bb732be1e53ffdffe5 (diff)
parentb61b77941f3774e6d7373bab9607b70f4acbd7e0 (diff)
Merge branch 'joeyconfig'
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 28246dfe..063a2eda 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -573,8 +573,8 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
, "# Enable postgrey."
, "smtpd_recipient_restrictions = permit_tls_clientcerts,permit_sasl_authenticated,,permit_mynetworks,reject_unauth_destination,check_policy_service inet:127.0.0.1:10023"
- , "# Enable spamass-milter, amavis-milter, opendkim"
- , "smtpd_milters = unix:/spamass/spamass.sock unix:amavis/amavis.sock inet:localhost:8891"
+ , "# Enable spamass-milter, amavis-milter (opendkim is not enabled because it causes mails forwarded from eg gmail to be rejected)"
+ , "smtpd_milters = unix:/spamass/spamass.sock unix:amavis/amavis.sock"
, "# opendkim is used for outgoing mail"
, "non_smtpd_milters = inet:localhost:8891"
, "milter_connect_macros = j {daemon_name} v {if_name} _"