Improve spamhaus RBL support.

Submitted by: AL

1 files changed, 6 insertions, 15 deletions

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 498defa40..4db1e45a3 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -322,21 +322,12 @@ metric {
         description = "One received header with 'bad' patterns inside";
         name = "ONCE_RECEIVED_STRICT";
     }
-    symbol {
-        weight = 2.0;
-        description = "From address is listed in zen spamhaus BL";
-        name = "RBL_ZEN";
-    }
-    symbol {
-        weight = 3.0;
-        description = "Received headers contains addresses from XBL spamhaus RBL";
-        name = "RBL_XBL";
-    }
-    symbol {
-        weight = 2.0;
-        description = "Received headers contains addresses from PBL spamhaus RBL";
-        name = "RBL_PBL";
-    }
+    symbol { name = "RBL_SPAMHAUS"; weight = 0.0; description = "From address is listed in zen"; }
+    symbol { name = "RBL_SPAMHAUS_SBL"; weight = 2.0; description = "From address is listed in zen sbl"; }
+    symbol { name = "RBL_SPAMHAUS_CSS"; weight = 2.0; description = "From address is listed in zen css"; }
+    symbol { name = "RBL_SPAMHAUS_XBL"; weight = 4.0; description = "From address is listed in zen xbl"; }
+    symbol { name = "RBL_SPAMHAUS_PBL"; weight = 2.0; description = "From address is listed in zen pbl"; }
+    symbol { name = "RECEIVED_SPAMHAUS_XBL"; weight = 3.0; description = "Received address is listed in zen pbl"; }
     symbol {
         weight = 2.0;
         description = "From address is listed in senderscore.com BL";