summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Brooks2017-04-04 23:31:41 -0700
committerDaniel Brooks2017-04-04 23:31:41 -0700
commit4031b974e8035a74f582aa95780c5d3413032625 (patch)
treef275ca29c5c634fead154079ab7855c2a1cde82d /src
parentd1cbc66cb06482a5cb4168fc44b7e84fd4e8849e (diff)
parentfcc5b96e595a20a8b93989fa59f2b73d1b6d3a1b (diff)
Merge branch 'master' of https://git.joeyh.name/git/propellor into fstab-swap
Diffstat (limited to 'src')
-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} _"