Merge remote-tracking branch 'upstream/master'

1 files changed, 60 insertions, 34 deletions

diff --git a/conf/modules.conf b/conf/modules.conf
index 2b7d5b8b8..41296b7bf 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -1,24 +1,28 @@
 # Rspamd modules configuration
 fuzzy_check {
-    servers = "highsecure.ru:11335";
-    symbol = "R_FUZZY";
     min_bytes = 300;
-    max_score = 10;
-    mime_types = "application/pdf";
-    fuzzy_map = {
-        FUZZY_DENIED {
-            weight = 10.0;
-            flag = 1
-        }
-        FUZZY_PROB {
-            weight = 5.0;
-            flag = 2
-        }
-        FUZZY_WHITE {
-            weight = -2.1;
-            flag = 3
-        }
-    }
+	rule {
+		servers = "highsecure.ru:11335";
+		symbol = "FUZZY_UNKNOWN";
+		mime_types = "application/pdf";
+		max_score = 20.0;
+		read_only = yes;
+		skip_unknown = yes;
+		fuzzy_map = {
+			FUZZY_DENIED {
+				max_score = 20.0;
+				flag = 1
+			}
+			FUZZY_PROB {
+				max_score = 10.0;
+				flag = 2
+			}
+			FUZZY_WHITE {
+				max_score = 2.0;
+				flag = 3
+			}
+		}
+	}
 }
 forged_recipients {
     symbol_sender = "FORGED_SENDER";
@@ -67,28 +71,34 @@ rbl {
     default_from = true;
 
     rbls {
-    spamhaus_zen {
-       symbol = "RBL_ZEN";
-       rbl = "zen.spamhaus.org";
-       ipv4 = true;
-       ipv6 = true;
-    }
-    spamhaus_pbl {
-       symbol = "RECEIVED_PBL";
-       rbl = "pbl.spamhaus.org";
-       ipv4 = true;
-       ipv6 = true;
-       received = true;
-       from = false;
-    }
-    spamhaus_pbl {
-       symbol = "RECEIVED_XBL";
+	
+	spamhaus {
+		symbol = "RBL_SPAMHAUS";
+		rbl = "zen.spamhaus.org";
+		ipv4 = true;
+		ipv6 = true;
+		unknown = false;
+		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";
        rbl = "xbl.spamhaus.org";
        ipv4 = true;
        ipv6 = true;
        received = true;
        from = false;
     }
+
     mailspike {
        symbol = "RBL_MAILSPIKE";
        rbl = "bl.mailspike.net";
@@ -97,6 +107,22 @@ rbl {
        symbol = "RBL_SENDERSCORE";
        rbl = "bl.score.senderscore.com";
     }
+    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"
+       }
+    }
  }
 }