aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2018-03-21 11:11:52 +0000
committerGitHub <noreply@github.com>2018-03-21 11:11:52 +0000
commit5144cb0b4f32324f5e761dcdc458360d3b71d811 (patch)
tree4c1262b6c0d9c12a4823ab4e4b7f3c8f6bc5b78f
parent9e1bcc12c2238e48ea246875ea8090cfc24e25cf (diff)
parent3fa2392fd16f72ada39257e99d2a12a059bb9448 (diff)
downloadrspamd-5144cb0b4f32324f5e761dcdc458360d3b71d811.tar.gz
rspamd-5144cb0b4f32324f5e761dcdc458360d3b71d811.zip
Merge pull request #2098 from moisseev/spam-flag
[Minor] Move remove_upstream_spam_flag default setting to lua script
-rw-r--r--conf/modules.d/milter_headers.conf1
-rw-r--r--src/plugins/lua/milter_headers.lua1
2 files changed, 1 insertions, 1 deletions
diff --git a/conf/modules.d/milter_headers.conf b/conf/modules.d/milter_headers.conf
index 99892f8af..e01d6e0f4 100644
--- a/conf/modules.d/milter_headers.conf
+++ b/conf/modules.d/milter_headers.conf
@@ -18,7 +18,6 @@ milter_headers {
# Refer to https://rspamd.com/doc/modules/milter_headers.html for information on configuration
use = [];
- remove_upstream_spam_flag = true;
# Compatibility
.include(try=true,priority=5) "${DBDIR}/dynamic/rmilter_headers.conf"
diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua
index 6f8638f58..11c08d6d5 100644
--- a/src/plugins/lua/milter_headers.lua
+++ b/src/plugins/lua/milter_headers.lua
@@ -29,6 +29,7 @@ local E = {}
local HOSTNAME = util.get_hostname()
local settings = {
+ remove_upstream_spam_flag = true;
skip_local = true,
skip_authenticated = true,
local_headers = {},