Mirrors/rspamd
1
0
Fork 0
mirror of https://github.com/rspamd/rspamd.git synced 2024-08-27 17:55:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Minor] Rbl: Improve migration portability

Browse Source
This commit is contained in:
Vsevolod Stakhov 2019-09-30 09:12:42 +01:00
parent 195ca5a2a3
commit 98080882fd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lualib/lua_cfg_transform.lua
View File

@ -239,9 +239,8 @@ local function surbl_section_convert(cfg, section)
local wl = section.whitelist
for name,value in pairs(section.rules or {}) do
if rbl_section[name] then
logger.warnx(rspamd_config, 'conflicting names in surbl and rbl rules: %s, ignore rbl rule!',
logger.warnx(rspamd_config, 'conflicting names in surbl and rbl rules: %s, prefer surbl rule!',
name)
rbl_section[name] = {}
end
local converted = {
urls = true,
@ -284,7 +283,7 @@ local function surbl_section_convert(cfg, section)
converted[k] = lua_util.deepcopy(v)
end
end
rbl_section[name] = converted
rbl_section[name] = lua_util.override_defaults(rbl_section[name], converted)
end
end
@ -294,9 +293,8 @@ local function emails_section_convert(cfg, section)
local wl = section.whitelist
for name,value in pairs(section.rules or {}) do
if rbl_section[name] then
logger.warnx(rspamd_config, 'conflicting names in emails and rbl rules: %s, ignore rbl rule!',
logger.warnx(rspamd_config, 'conflicting names in emails and rbl rules: %s, prefer emails rule!',
name)
rbl_section[name] = {}
end
local converted = {
emails = true,
@ -338,7 +336,7 @@ local function emails_section_convert(cfg, section)
converted[k] = lua_util.deepcopy(v)
end
end
rbl_section[name] = converted
rbl_section[name] = lua_util.override_defaults(rbl_section[name], converted)
end
end