Jgreen has submitted this change and it was merged.
Change subject: exim adds Precedence: bulk for OTRS when it finds X-List-*
headers
......................................................................
exim adds Precedence: bulk for OTRS when it finds X-List-* headers
Change-Id: I596840fdba04d94d855639711542c4fb9c20bae5
---
M templates/exim/system_filter.conf.erb
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/exim/system_filter.conf.erb
b/templates/exim/system_filter.conf.erb
index cdc9cc1..671b276 100644
--- a/templates/exim/system_filter.conf.erb
+++ b/templates/exim/system_filter.conf.erb
@@ -11,6 +11,7 @@
endif
if $acl_m0 is not "" and $acl_m0 is not "trusted relay" then
headers add "X-Spam-Score: $acl_m0"
+ headers add "X-Spam-Report: $acl_m1"
<% if enable_otrs_server == "true" then -%>
# Add header for OTRS filters
if $acl_m1 is not "" and $acl_m1 begins "yes" then
@@ -21,8 +22,21 @@
else
headers add "X-Spam-Flag: NO"
endif
+ # add a hook for OTRS to filter list mail
+ if
+ ($message_headers contains "\nList-Id:" or
+ $message_headers contains "\nList-Help:" or
+ $message_headers contains "\nList-Subscribe:" or
+ $message_headers contains "\nList-Unsubscribe:" or
+ $message_headers contains "\nList-Post:" or
+ $message_headers contains "\nList-Owner:" or
+ $message_headers contains "\nList-Archive:") and
+ $header_precedence: does not match "^(bulk|junk|list)"
+ then
+ headers remove Precedence
+ headers add "Precedence: bulk"
+ endif
<% end -%>
- headers add "X-Spam-Report: $acl_m1"
endif
endif
--
To view, visit https://gerrit.wikimedia.org/r/80657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I596840fdba04d94d855639711542c4fb9c20bae5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <jgr...@wikimedia.org>
Gerrit-Reviewer: Jgreen <jgr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
