diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-09-24 12:06:11 +0100 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-09-24 12:06:11 +0100 |
commit | 930f9f4d92aed70dba3ade394a2cf2f7d2025292 (patch) | |
tree | 6d3bc31938ca9991ce6625ae78238c466d700fb9 | |
parent | df4d5ecaec79806ea0b517605eeb30f338ac52d0 (diff) | |
download | rspamd-930f9f4d92aed70dba3ade394a2cf2f7d2025292.tar.gz rspamd-930f9f4d92aed70dba3ade394a2cf2f7d2025292.zip |
[Conf] Use multi-prefixes RBLs in the default config
-rw-r--r-- | conf/modules.d/rbl.conf | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf index c535a7bf6..96d442525 100644 --- a/conf/modules.d/rbl.conf +++ b/conf/modules.d/rbl.conf @@ -31,30 +31,19 @@ rbl { symbol = "RBL_SPAMHAUS"; rbl = "zen.spamhaus.org"; ipv6 = true; - returncodes { - RBL_SPAMHAUS_SBL = "127.0.0.2"; - RBL_SPAMHAUS_CSS = "127.0.0.3"; - RBL_SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5", - "127.0.0.6", "127.0.0.7"]; - RBL_SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"]; - RBL_SPAMHAUS_DROP = "127.0.0.9"; - } - } - - spamhaus_received { - symbol = "RECEIVED_SPAMHAUS"; - rbl = "zen.spamhaus.org"; - ipv6 = true; received = true; - from = false; - ignore_whitelists = true; + from = true; + symbols_prefixes = { + received = 'RECEIVED', + from = 'RBL', + } returncodes { - RECEIVED_SPAMHAUS_SBL = "127.0.0.2"; - RECEIVED_SPAMHAUS_CSS = "127.0.0.3"; - RECEIVED_SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5", + SPAMHAUS_SBL = "127.0.0.2"; + SPAMHAUS_CSS = "127.0.0.3"; + SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5", "127.0.0.6", "127.0.0.7"]; - RECEIVED_SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"]; - RECEIVED_SPAMHAUS_DROP = "127.0.0.9"; + SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"]; + SPAMHAUS_DROP = "127.0.0.9"; } } @@ -134,18 +123,15 @@ rbl { } blocklistde { - symbol = "RBL_BLOCKLISTDE"; - rbl = "bl.blocklist.de"; - ipv6 = true; - } - - blocklistde_received { - symbol = "RECEIVED_BLOCKLISTDE"; + symbols_prefixes = { + received = 'RECEIVED', + from = 'RBL', + } + symbol = "BLOCKLISTDE"; rbl = "bl.blocklist.de"; ipv6 = true; received = true; - from = false; - ignore_whitelists = true; + from = true; } dnswl_dwl { |