commit 930f9f4: [Conf] Use multi-prefixes RBLs in the default config
Vsevolod Stakhov
vsevolod at highsecure.ru
Tue Sep 24 11:28:09 UTC 2019
Author: Vsevolod Stakhov
Date: 2019-09-24 12:06:11 +0100
URL: https://github.com/rspamd/rspamd/commit/930f9f4d92aed70dba3ade394a2cf2f7d2025292
[Conf] Use multi-prefixes RBLs in the default config
---
conf/modules.d/rbl.conf | 46 ++++++++++++++++------------------------------
1 file 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 {
More information about the Commits
mailing list