From: Alexey <AlexeySa@users.noreply.github.com>
Date: Thu, 22 May 2014 18:04:27 +0000 (-0700)
Subject: Remove duplicate rbl rule
X-Git-Tag: 0.7.0~209^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec54defff21d50b8cfc53c3b0cc641968e9648c6;p=thirdparty%2Frspamd.git

Remove duplicate rbl rule
---

diff --git a/conf/modules.conf b/conf/modules.conf
index d7f396b472..57ff855c25 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -85,21 +85,21 @@ surbl {
 rbl {
  rbls {
 	
-	spamhaus {
-		symbol = "RBL_SPAMHAUS";
-		rbl = "zen.spamhaus.org";
-		ipv6 = true;
-		returncodes {
-		RBL_SPAMHAUS_SBL = "127.0.0.2";
-		RBL_SPAMHAUS_CSS = "127.0.0.3";
-		RBL_SPAMHAUS_XBL = "127.0.0.4";
-		RBL_SPAMHAUS_XBL = "127.0.0.5";
-		RBL_SPAMHAUS_XBL = "127.0.0.6";
-		RBL_SPAMHAUS_XBL = "127.0.0.7";
-		RBL_SPAMHAUS_PBL = "127.0.0.10";
-		RBL_SPAMHAUS_PBL = "127.0.0.11";
-		}
-	}
+    spamhaus {
+        symbol = "RBL_SPAMHAUS";
+        rbl = "zen.spamhaus.org";
+        ipv6 = true;
+        returncodes {
+            RBL_SPAMHAUS_SBL = "127.0.0.2";
+            RBL_SPAMHAUS_CSS = "127.0.0.3";
+            RBL_SPAMHAUS_XBL = "127.0.0.4";
+            RBL_SPAMHAUS_XBL = "127.0.0.5";
+            RBL_SPAMHAUS_XBL = "127.0.0.6";
+            RBL_SPAMHAUS_XBL = "127.0.0.7";
+            RBL_SPAMHAUS_PBL = "127.0.0.10";
+            RBL_SPAMHAUS_PBL = "127.0.0.11";
+        }
+    }
 
     spamhaus_xbl {
        symbol = "RECEIVED_SPAMHAUS_XBL";
@@ -133,16 +133,16 @@ rbl {
        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"
+            #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"
        }
     }
     
@@ -186,14 +186,10 @@ once_received {
     symbol_strict = "ONCE_RECEIVED_STRICT";
     symbol = "ONCE_RECEIVED";
 }
-multimap {
-    spamhaus { 
-        type = "dnsbl"; 
-        map = "pbl.spamhaus.org"; 
-        symbol = "R_IP_PBL"; 
-        description = "PBL dns block list"; 
-    }
-}
+
+#multimap {
+#}
+
 phishing {
     symbol = "PHISHING";
 }