From c9f455a2b1c17b70ea0d8d888149ec6426ebdc05 Mon Sep 17 00:00:00 2001 From: andryyy Date: Wed, 4 Mar 2020 11:53:07 +0100 Subject: [PATCH] [Rspamd] Move monitoring hosts to monitoring_nolog.map file --- data/conf/rspamd/custom/monitoring_nolog.map | 6 ++++++ data/conf/rspamd/lua/rspamd.local.lua | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 data/conf/rspamd/custom/monitoring_nolog.map diff --git a/data/conf/rspamd/custom/monitoring_nolog.map b/data/conf/rspamd/custom/monitoring_nolog.map new file mode 100644 index 00000000..a997e786 --- /dev/null +++ b/data/conf/rspamd/custom/monitoring_nolog.map @@ -0,0 +1,6 @@ +# Skip logging for these addresses +/monitoring-system@everycloudtech.us/i +/monitor@tools.mailflowmonitoring.com/i +/watchdog@localhost/i +/supertool@mxtoolbox.com/i +/test@mxtoolboxsmtpdiag.com/i diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua index 204cc10f..352853bc 100644 --- a/data/conf/rspamd/lua/rspamd.local.lua +++ b/data/conf/rspamd/lua/rspamd.local.lua @@ -7,6 +7,11 @@ rspamd_config.MAILCOW_AUTH = { end } +local monitoring_hosts = rspamd_config:add_map{ + url = "/etc/rspamd/custom/monitoring_nolog.map", + description = "Monitoring hosts", + type = "regexp" +} rspamd_config:register_symbol({ name = 'KEEP_SPAM', @@ -203,7 +208,7 @@ rspamd_config:register_symbol({ type = 'postfilter', callback = function(task) local from = task:get_header('From') - if from and (string.find(from, 'monitoring-system@everycloudtech.us', 1, true) or string.find(from, 'monitor@tools.mailflowmonitoring.com', 1, true) or from == 'watchdog@localhost') then + if from and monitoring_hosts:get_key(from) then task:set_flag('no_log') task:set_flag('no_stat') end