Merge pull request #177 from fatalbanana/master

More fixes & improvements for RBL module

1 files changed, 12 insertions, 8 deletions

diff --git a/conf/modules.conf b/conf/modules.conf
index 9cb26fa5a..582ca5204 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -87,7 +87,6 @@ rbl {
  default_from = true;
  default_received = false;
  default_exclude_users = true;
- default_exclude_private_ips = true;
 
  private_ips = "127.0.0.0/8 10.0.0.0/8 192.168.0.0/16 169.254.0.0/16 172.16.0.0/12 100.64.0.0/10 fc00::/7 fe80::/10 fec0::/10 ::1";
 
@@ -201,6 +200,16 @@ rbl {
         }
     }
 
+    rambleremails {
+        symbol = RAMBLER_EMAILBL;
+        rbl = email-bl.rambler.ru;
+        from = false;
+        emails = true;
+        exclude_users = false;
+        exclude_private_ips = false;
+        exclude_local = false;
+    }
+
  }
 }
 
@@ -222,13 +231,8 @@ once_received {
 phishing {
     symbol = "PHISHING";
 }
-emails {
-    rule { 
-        symbol = RAMBLER_EMAILBL;
-        dnsbl = email-bl.rambler.ru;
-        domain_only = false;
-    }
-}
+#emails {
+#}
 spf {
     spf_cache_size = 2k;
     spf_cache_expire = 1d;