Merge pull request #76 from AlexeySa/master

Some adding for RBL and SURBL

1 files changed, 32 insertions, 2 deletions

diff --git a/conf/modules.conf b/conf/modules.conf
index 57ff855c2..160680fd2 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -108,10 +108,33 @@ rbl {
        received = true;
        from = false;
     }
+    
+    spamhaus_swl {
+        symbol = "RWL_SPAMHAUS_WL";
+        rbl = "swl.spamhaus.org";
+        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 = "RBL_MAILSPIKE";
-       rbl = "bl.mailspike.net";
+       rbl = "rep.mailspike.net";
+         returncodes {
+            #http://mailspike.net/usage.html
+            RBL_MAILSPIKE_WORST = "127.0.0.10"
+            RBL_MAILSPIKE_VERYBAD = "127.0.0.11"
+            RBL_MAILSPIKE_BAD = "127.0.0.12"
+            RBL_MAILSPIKE_SUSP = "127.0.0.13"
+            RBL_MAILSPIKE_PROB = "127.0.0.14"
+            RWL_MAILSPIKE_POSSIBLE = "127.0.0.17"
+            RWL_MAILSPIKE_GOOD = "127.0.0.18"
+            RWL_MAILSPIKE_VERYGOOD = "127.0.0.19"
+            RWL_MAILSPIKE_EXCELLENT = "127.0.0.20"
+         }
     }
     
     senderscore {
@@ -151,6 +174,13 @@ rbl {
         rbl = "bl.spameatingmonkey.net";
     }
     
+    semIPv6 {
+        symbol = "RBL_SEM_IPV6";
+        rbl = "bl.ipv6.spameatingmonkey.net";
+        ipv4 = false;
+        ipv6 = true;
+    }
+    
     nszones {
        symbol = "RBL_NSZONES";
        rbl = "sbl.nszones.com";
@@ -164,8 +194,8 @@ rbl {
     dnswl {
         symbol = "RCVD_IN_DNSWL";
         rbl = "list.dnswl.org";
-        unknown = true;
         returncodes {
+            RCVD_IN_DNSWL_NONE = "127.0.%d+.0";
             RCVD_IN_DNSWL_LOW = "127.0.%d+.1";
             RCVD_IN_DNSWL_MED = "127.0.%d+.2";
             RCVD_IN_DNSWL_HI  = "127.0.%d+.3";