[Minor] Reduce number of lookups for Mailspike

diff --git a/conf/metrics.conf b/conf/metrics.conf
index ecb8105dc05207c48e2860a697ac8aa0ee582ed1..0bab8ea51aa9b49a9c3789efcfc2dc197afad630 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -537,45 +537,41 @@ metric {
             weight = 1.0;
             description = "From address is listed in UCEPROTECT LEVEL1 BL";
         }
-        symbol "RBL_MAILSPIKE" {
+        symbol "MAILSPIKE" {
             weight = 0.0;
-            description = "Unrecognised result from Mailspike blacklist";
+            description = "Unrecognised result from Mailspike";
         }
-        symbol "RWL_MAILSPIKE" {
+        symbol "RWL_MAILSPIKE_NEUTRAL" {
             weight = 0.0;
-            description = "Unrecognised result from Mailspike whitelist";
-        }
-        symbol "RBL_MAILSPIKE_ZOMBIE" {
-            weight = 2.0;
-            description = "From address is listed in RBL";
+            description = "Neutral result from Mailspike";
         }
         symbol "RBL_MAILSPIKE_WORST" {
             weight = 2.0;
-            description = "From address is listed in RBL";
+            description = "From address is listed in RBL - worst possible reputation";
         }
         symbol "RBL_MAILSPIKE_VERYBAD" {
             weight = 1.5;
-            description = "From address is listed in RBL";
+            description = "From address is listed in RBL - very bad reputation";
         }
         symbol "RBL_MAILSPIKE_BAD" {
             weight = 1.0;
-            description = "From address is listed in RBL";
+            description = "From address is listed in RBL - bad reputation";
         }
         symbol "RWL_MAILSPIKE_POSSIBLE" {
             weight = 0.0;
-            description = "From address is listed in RWL";
+            description = "From address is listed in RWL - possibly legit";
         }
         symbol "RWL_MAILSPIKE_GOOD" {
             weight = 0.0;
-            description = "From address is listed in RWL";
+            description = "From address is listed in RWL - good reputation";
         }
         symbol "RWL_MAILSPIKE_VERYGOOD" {
             weight = 0.0;
-            description = "From address is listed in RWL";
+            description = "From address is listed in RWL - very good reputation";
         }
         symbol "RWL_MAILSPIKE_EXCELLENT" {
             weight = 0.0;
-            description = "From address is listed in RWL";
+            description = "From address is listed in RWL - excellent reputation";
         }
 
         symbol "RBL_SORBS" {

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index 7544881bfc73383301ef45d24ce885e1a6f5b455..28d1e39b9f78431d84c0f5e6906d10beb138adea 100644 (file)
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -64,27 +64,23 @@ rbl {
             }
         }
 
-        mailspike_bl {
-            symbol = "RBL_MAILSPIKE";
-            unknown = true;
-            rbl = "bl.mailspike.net";
-            returncodes {
-                RBL_MAILSPIKE_ZOMBIE = "127.0.0.2";
-                RBL_MAILSPIKE_WORST = "127.0.0.10";
-                RBL_MAILSPIKE_VERYBAD = "127.0.0.11";
-                RBL_MAILSPIKE_BAD = "127.0.0.12";
-            }
-        }
-
-        mailspike_wl {
-            symbol = "RWL_MAILSPIKE";
-            rbl = "wl.mailspike.net";
+        mailspike {
+            symbol = "MAILSPIKE";
+            rbl = "rep.mailspike.net";
             is_whitelist = true;
             unknown = true;
-            whitelist_exception = "RWL_MAILSPIKE";
+            whitelist_exception = "MAILSPIKE";
             whitelist_exception = "RWL_MAILSPIKE_GOOD";
+            whitelist_exception = "RWL_MAILSPIKE_NEUTRAL";
             whitelist_exception = "RWL_MAILSPIKE_POSSIBLE";
+            whitelist_exception = "RBL_MAILSPIKE_WORST";
+            whitelist_exception = "RBL_MAILSPIKE_VERYBAD";
+            whitelist_exception = "RBL_MAILSPIKE_BAD";
             returncodes {
+                RBL_MAILSPIKE_WORST = "127.0.0.10";
+                RBL_MAILSPIKE_VERYBAD = "127.0.0.11";
+                RBL_MAILSPIKE_BAD = "127.0.0.12";
+                RWL_MAILSPIKE_NEUTRAL = ["127.0.0.16", "127.0.0.15", "127.0.0.14", "127.0.0.13"];
                 RWL_MAILSPIKE_POSSIBLE = "127.0.0.17";
                 RWL_MAILSPIKE_GOOD = "127.0.0.18";
                 RWL_MAILSPIKE_VERYGOOD = "127.0.0.19";