[Fix] Avoid extra symbols for RBLs

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 9441310804facc8fd2a82a8e7b3f920955399c96..ecb8105dc05207c48e2860a697ac8aa0ee582ed1 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -487,18 +487,6 @@ metric {
             weight = 4.0;
             description = "From address is listed in zen xbl";
         }
-        symbol "RBL_SPAMHAUS_XBL1" {
-            weight = 4.0;
-            description = "From address is listed in zen xbl (obsoleted/reserved)";
-        }
-        symbol "RBL_SPAMHAUS_XBL2" {
-            weight = 4.0;
-            description = "From address is listed in zen xbl (obsoleted/reserved)";
-        }
-        symbol "RBL_SPAMHAUS_XBL3" {
-            weight = 4.0;
-            description = "From address is listed in zen xbl (reserved)";
-        }
         symbol "RBL_SPAMHAUS_XBL_ANY" {
             weight = 4.0;
             description = "From or receive address is listed in zen xbl (any list)";
@@ -507,10 +495,6 @@ metric {
             weight = 2.0;
             description = "From address is listed in zen pbl (ISP list)";
         }
-        symbol "RBL_SPAMHAUS_PBL1" {
-            weight = 2.0;
-            description = "From address is listed in zen pbl (Spamhaus list)";
-        }
         symbol "RBL_SPAMHAUS_DROP" {
             weight = 7.0;
             description = "From address is listed in zen drop bl";

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index dc2b2bdcc03c6655a2e43ae140602dd2c5b5f43e..7544881bfc73383301ef45d24ce885e1a6f5b455 100644 (file)
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -28,23 +28,25 @@ rbl {
             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_XBL = "127.0.0.4";
-                RBL_SPAMHAUS_XBL1 = "127.0.0.5";
-                RBL_SPAMHAUS_XBL2 = "127.0.0.6";
-                RBL_SPAMHAUS_XBL3 = "127.0.0.7";
-                RBL_SPAMHAUS_PBL = "127.0.0.10";
-                RBL_SPAMHAUS_PBL1 = "127.0.0.11";
+                RBL_SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"];
                 RBL_SPAMHAUS_DROP = "127.0.0.9";
             }
         }
 
         spamhaus_xbl {
-            symbol = "RECEIVED_SPAMHAUS_XBL";
-            rbl = "xbl.spamhaus.org";
+            symbol = "RECEIVED_SPAMHAUS";
+            rbl = "zen.spamhaus.org";
             ipv6 = true;
             received = true;
             from = false;
             ignore_whitelists = true;
+            returncodes {
+                RECEIVED_SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5",
+                    "127.0.0.6", "127.0.0.7"];
+            }
         }
 
         spamhaus_swl {