[Minor] Drop SORBS & Spamhaus Whitelist

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 320170636044724722a5a0edaa78d5c7bfc06fde..a8eff289ceea2785c1b3714215647f69f2f71d78 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -148,26 +148,6 @@ metric {
             one_shot = true;
         }
 
-        symbol "RWL_SPAMHAUS_WL" {
-            weight = 0.0;
-            description = "Unrecognised result from Spamhaus whitelist";
-        }
-        symbol "RWL_SPAMHAUS_WL_IND" {
-            weight = 0.0;
-            description = "Sender listed at Spamhaus whitelist";
-        }
-        symbol "RWL_SPAMHAUS_WL_TRANS" {
-            weight = 0.0;
-            description = "Sender listed at Spamhaus whitelist";
-        }
-        symbol "RWL_SPAMHAUS_WL_IND_EXP" {
-            weight = 0.0;
-            description = "Sender listed at Spamhaus whitelist";
-        }
-        symbol "RWL_SPAMHAUS_WL_TRANS_EXP" {
-            weight = 0.0;
-            description = "Sender listed at Spamhaus whitelist";
-        }
         symbol "RBL_SENDERSCORE" {
             weight = 2.0;
             description = "From address is listed in senderscore.com BL";
@@ -213,47 +193,6 @@ metric {
             description = "From address is listed in RWL - excellent reputation";
         }
 
-        symbol "RBL_SORBS" {
-            weight = 0.0;
-            description = "Unrecognised result from SORBS RBL";
-        }
-        symbol "RBL_SORBS_HTTP" {
-            weight = 2.5;
-            description = "List of Open HTTP Proxy Servers.";
-        }
-        symbol "RBL_SORBS_SOCKS" {
-            weight = 2.5;
-            description = "List of Open SOCKS Proxy Servers.";
-        }
-        symbol "RBL_SORBS_MISC" {
-            weight = 1.0;
-            description = "List of open Proxy Servers not listed in the SOCKS or HTTP lists.";
-        }
-        symbol "RBL_SORBS_SMTP" {
-            weight = 3.0;
-            description = "List of Open SMTP relay servers.";
-        }
-        symbol "RBL_SORBS_RECENT" {
-            weight = 1.5;
-            description = "List of hosts that have been noted as sending spam/UCE/UBE to the admins of SORBS within the last 28 days (includes new.spam.dnsbl.sorbs.net).";
-        }
-        symbol "RBL_SORBS_WEB" {
-            weight = 0.4;
-            description = "List of web (WWW) servers which have spammer abusable vulnerabilities (e.g. FormMail scripts)";
-        }
-        symbol "RBL_SORBS_DUL" {
-            weight = 2.0;
-            description = "Dynamic IP Address ranges (NOT a Dial Up list!)";
-        }
-        symbol "RBL_SORBS_BLOCK" {
-            weight = 1.0;
-            description = "List of hosts demanding that they never be tested by SORBS.";
-        }
-        symbol "RBL_SORBS_ZOMBIE" {
-            weight = 1.0;
-            description = "List of networks hijacked from their original owners, some of which have already used for spamming.";
-        }
-
         symbol "RBL_SEM" {
             weight = 1.0;
             description = "Address is listed in Spameatingmonkey RBL";

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index c2ba98e200b4c57fb332cb2722d4214e0f0e65a6..2cc420cbe8e1dd853206ecce1a87cfc8523efc21 100644 (file)
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -48,20 +48,6 @@ rbl {
             }
         }
 
-        spamhaus_swl {
-            symbol = "RWL_SPAMHAUS_WL";
-            rbl = "swl.spamhaus.org";
-            ipv6 = true;
-            is_whitelist = true;
-            whitelist_exception = "RWL_SPAMHAUS_WL";
-            returncodes {
-                RWL_SPAMHAUS_WL_IND = "127.0.2.2";
-                RWL_SPAMHAUS_WL_TRANS = "127.0.2.3";
-                RWL_SPAMHAUS_WL_IND_EXP = "127.0.2.102";
-                RWL_SPAMHAUS_WL_TRANS_EXP = "127.0.2.103";
-            }
-        }
-
         mailspike {
             symbol = "MAILSPIKE";
             rbl = "rep.mailspike.net";
@@ -95,23 +81,6 @@ rbl {
             rbl = "spam.abuse.ch";
         }
 
-        sorbs {
-            symbol = "RBL_SORBS";
-            rbl = "dnsbl.sorbs.net";
-            returncodes {
-                # http:// www.sorbs.net/general/using.shtml
-                RBL_SORBS_HTTP = "127.0.0.2";
-                RBL_SORBS_SOCKS = "127.0.0.3";
-                RBL_SORBS_MISC = "127.0.0.4";
-                RBL_SORBS_SMTP = "127.0.0.5";
-                RBL_SORBS_RECENT = "127.0.0.6";
-                RBL_SORBS_WEB = "127.0.0.7";
-                RBL_SORBS_DUL = "127.0.0.10";
-                RBL_SORBS_BLOCK = "127.0.0.8";
-                RBL_SORBS_ZOMBIE = "127.0.0.9";
-            }
-        }
-
         sem {
             symbol = "RBL_SEM";
             rbl = "bl.spameatingmonkey.net";