Jgreen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/77844
Change subject: system-filter template formatting cleanup + comments
......................................................................
system-filter template formatting cleanup + comments
Change-Id: I27587c9590acf5da89ba74884ff05d5406e734d7
---
M templates/exim/system_filter.conf.erb
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/77844/1
diff --git a/templates/exim/system_filter.conf.erb
b/templates/exim/system_filter.conf.erb
index acbdc56..008f1e2 100644
--- a/templates/exim/system_filter.conf.erb
+++ b/templates/exim/system_filter.conf.erb
@@ -2,6 +2,7 @@
if first_delivery then
<% if enable_otrs_server == "true" then -%>
+ # Remove headers that control OTRS - we don't want these
headers remove
X-OTRS-Priority:X-OTRS-Queue:X-OTRS-Lock:X-OTRS-Ignore:X-OTRS-State
<% end -%>
if $acl_m0 is not "trusted relay" then
@@ -12,9 +13,10 @@
headers add "X-Spam-Score: $acl_m0"
headers add "X-Spam-Report: $acl_m1"
<% if enable_otrs_server == "true" then -%>
- if $header_X-Spam-Score matches "\\N\(\\+{5,}\)\\N" then
- headers add "X-OTRS-Queue: Junk"
- endif
+ # Instruct OTRS to sort this mail into its Junk queue
+ if $header_X-Spam-Score matches "\\N\(\\+{5,}\)\\N" then
+ headers add "X-OTRS-Queue: Junk"
+ endif
<% end -%>
endif
endif
--
To view, visit https://gerrit.wikimedia.org/r/77844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27587c9590acf5da89ba74884ff05d5406e734d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
