From: Andrew Lewis <nerf@judo.za.org>
Date: Thu, 31 Dec 2015 12:00:43 +0000 (+0200)
Subject: Drop deprecated SURBL bits & rename JP_SURBL_MULTI to ABUSE_SURBL
X-Git-Tag: 1.1.0~169^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9074b2eb2691d895a8703c28b2e74cebd238f7dc;p=thirdparty%2Frspamd.git

Drop deprecated SURBL bits & rename JP_SURBL_MULTI to ABUSE_SURBL
---

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 90513fb1ac..13abc41e67 100644
--- 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 731c7fa648..9d40ffe545 100644
--- 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 {