Jgreen has submitted this change and it was merged.
Change subject: puppetize otrs system_filter stuff
......................................................................
puppetize otrs system_filter stuff
Change-Id: I77b0651487d6b19bdaa11b1080990e2a0870b386
---
M templates/exim/system_filter.conf.erb
1 file changed, 8 insertions(+), 0 deletions(-)
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 9640438..acbdc56 100644
--- a/templates/exim/system_filter.conf.erb
+++ b/templates/exim/system_filter.conf.erb
@@ -1,6 +1,9 @@
# Exim filter
if first_delivery then
+<% if enable_otrs_server == "true" then -%>
+ 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
# Remove any SpamAssassin headers and add local ones
headers remove
X-Spam-Score:X-Spam-Report:X-Spam-Checker-Version:X-Spam-Status:X-Spam-Level
@@ -8,6 +11,11 @@
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 -%>
+ 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/77843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77b0651487d6b19bdaa11b1080990e2a0870b386
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <[email protected]>
Gerrit-Reviewer: Jgreen <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
