Drop deprecated SURBL bits & rename JP_SURBL_MULTI to ABUSE_SURBL

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 90513fb1ac4e7c5e35e459da397e40fb94cdc15a..13abc41e67e7ac649fd95f021cca2eef3398c205 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -833,18 +833,8 @@ metric {
        }
        symbol {
            weight = 5.5;
-           description = "SURBL: AbuseButler web sites";
-           name = "AB_SURBL_MULTI";
-       }
-       symbol {
-           weight = 5.5;
-           description = "SURBL: SpamCop web sites";
-           name = "SC_SURBL_MULTI";
-       }
-       symbol {
-           weight = 5.5;
-           description = "SURBL: jwSpamSpy + Prolocation sites";
-           name = "JP_SURBL_MULTI";
+           description = "SURBL: ABUSE";
+           name = "ABUSE_SURBL";
        }
        symbol {
            weight = 5.5;

diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index 731c7fa6484422da6661d51cc29d6edc81e045e5..9d40ffe5451fb7f39135fb9f0f592039a0b56424 100644 (file)
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -7,12 +7,10 @@ surbl {
         suffix = "multi.surbl.org";
         symbol = "SURBL_MULTI";
         bits {
-            JP_SURBL_MULTI = 64;
-            AB_SURBL_MULTI = 32;
+            ABUSE_SURBL = 64;
             MW_SURBL_MULTI = 16;
             PH_SURBL_MULTI = 8;
             WS_SURBL_MULTI = 4;
-            SC_SURBL_MULTI = 2;
         }
     }
     rule {