Mark Bergsma has submitted this change and it was merged.
Change subject: Skip spam check if one of the recipients is postmaster@ or
abuse@
......................................................................
Skip spam check if one of the recipients is postmaster@ or abuse@
Right now spam reports to abuse@ can be rejected at the SMTP layer
if the spam score is too high. Let's avoid the issue altogether and
not run SpamAssassin on these.
Change-Id: I1ef3ab5606e4c47fb3e33c0554bc057c1277ff71
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index 958204e..66559a1 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -206,7 +206,8 @@
# Accept mail for postmaster without further policy checking,
# for compliance with the RFCs
- accept local_parts = postmaster
+ accept local_parts = postmaster : abuse
+ set acl_m2 = skip_spamd
<% end -%>
# Verify the recipient address for local domains, or require the
@@ -273,6 +274,9 @@
# the message is not too large
accept condition = ${if >{$message_size}{400K}}
+ # Skip if so requested
+ accept condition = ${if eq{$acl_m2}{skip_spamd}}
+
# Add spam headers if score >= 1
warn spam = nonexistent:true
condition = ${if >{$spam_score_int}{10}{1}{0}}
--
To view, visit https://gerrit.wikimedia.org/r/154044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ef3ab5606e4c47fb3e33c0554bc057c1277ff71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
