From a9b337089e84202ee7b0684ea4d7f058c93331fd Mon Sep 17 00:00:00 2001
From: Anton Yuzhaninov <citrin@citrin.ru>
Date: Fri, 10 Oct 2014 19:51:32 +0400
Subject: Config: improve SURBL symbols descriptions

---
 conf/metrics.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 8e90c97e0..0c3bb5800 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -575,32 +575,32 @@ metric {
     }
     symbol {
         weight = 5.500000;
-        description = "Phishing and malware sites";
+        description = "SURBL: Phishing and malware sites";
         name = "PH_SURBL_MULTI";
     }
     symbol {
         weight = 5.500000;
-        description = "Outblaze URI Blacklist";
+        description = "SURBL: Outblaze URI Blacklist";
         name = "OB_SURBL_MULTI";
     }
     symbol {
         weight = 5.500000;
-        description = "AbuseButler web sites";
+        description = "SURBL: AbuseButler web sites";
         name = "AB_SURBL_MULTI";
     }
     symbol {
         weight = 5.500000;
-        description = "SpamCop web sites";
+        description = "SURBL: SpamCop web sites";
         name = "SC_SURBL_MULTI";
     }
     symbol {
         weight = 5.500000;
-        description = "jwSpamSpy + Prolocation sites";
+        description = "SURBL: jwSpamSpy + Prolocation sites";
         name = "JP_SURBL_MULTI";
     }
     symbol {
         weight = 5.500000;
-        description = "sa-blacklist web sites ";
+        description = "SURBL: sa-blacklist web sites ";
         name = "WS_SURBL_MULTI";
     }
     symbol {
-- 
cgit v1.2.3


From ceac1763f3856ffaf1b754ca2c2d7fdfba7a5532 Mon Sep 17 00:00:00 2001
From: Anton Yuzhaninov <citrin@citrin.ru>
Date: Fri, 10 Oct 2014 19:58:25 +0400
Subject: Config: reflect SURBL changes.

Outblaze removed, malware moved to separate list:
http://www.surbl.org/news/internal/MW-malware-sublist-added-to-multi
---
 conf/metrics.conf | 6 +++---
 conf/modules.conf | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 0c3bb5800..5249b0274 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -575,13 +575,13 @@ metric {
     }
     symbol {
         weight = 5.500000;
-        description = "SURBL: Phishing and malware sites";
+        description = "SURBL: Phishing sites";
         name = "PH_SURBL_MULTI";
     }
     symbol {
         weight = 5.500000;
-        description = "SURBL: Outblaze URI Blacklist";
-        name = "OB_SURBL_MULTI";
+        description = "SURBL: Malware sites";
+        name = "MW_SURBL_MULTI";
     }
     symbol {
         weight = 5.500000;
diff --git a/conf/modules.conf b/conf/modules.conf
index 9d33430e2..3c1b264d1 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -34,14 +34,14 @@ maillist {
 surbl {
     whitelist = "file://$CONFDIR/surbl-whitelist.inc";
     exceptions = "file://$CONFDIR/2tld.inc";
-    
+
     rule {
         suffix = "multi.surbl.org";
         symbol = "SURBL_MULTI";
         bits {
             JP_SURBL_MULTI = 64;
             AB_SURBL_MULTI = 32;
-            OB_SURBL_MULTI = 16;
+            MW_SURBL_MULTI = 16;
             PH_SURBL_MULTI = 8;
             WS_SURBL_MULTI = 4;
             SC_SURBL_MULTI = 2;
-- 
cgit v1.2.3