Fix formatting and variables usage.

diff --git a/conf/modules.conf b/conf/modules.conf
index b68c2e0bdd22ff4adfa447eb6def51f27fbb494d..2b7d5b8b8c86b8245298090732f82c5a76e37b91 100644 (file)
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -5,20 +5,20 @@ fuzzy_check {
     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
-               }
-       }
+    fuzzy_map = {
+        FUZZY_DENIED {
+            weight = 10.0;
+            flag = 1
+        }
+        FUZZY_PROB {
+            weight = 5.0;
+            flag = 2
+        }
+        FUZZY_WHITE {
+            weight = -2.1;
+            flag = 3
+        }
+    }
 }
 forged_recipients {
     symbol_sender = "FORGED_SENDER";
@@ -28,39 +28,39 @@ maillist {
     symbol = "MAILLIST";
 }
 surbl {
-    whitelist = "file://$CONFDIR/rspamd/surbl-whitelist.inc";
-    exceptions = "file://$CONFDIR/rspamd/2tld.inc";
-       
-       rule {
-               suffix = "multi.surbl.org";
-               symbol = "SURBL_MULTI";
-               bits {
-                       JP_SURBL_MULTI = 64;
-                       AB_SURBL_MULTI = 32;
-                       OB_SURBL_MULTI = 16;
-                       PH_SURBL_MULTI = 8;
-                       WS_SURBL_MULTI = 4;
-                       SC_SURBL_MULTI = 2;
-               }
-       }
-       rule {
-               suffix = "multi.uribl.com";
-               symbol = "URIBL_MULTI";
-               bits {
-                       URIBL_BLACK = 2;
-                       URIBL_GREY = 4;
-                       URIBL_RED = 8;
-               }
-       }
-       rule {
-               suffix = "uribl.rambler.ru";
-               symbol = "RAMBLER_URIBL";
-       }
-       rule {
-               suffix = "dbl.spamhaus.org";
-               symbol = "DBL";
-               options = "noip";
-       }
+    whitelist = "file://$CONFDIR/surbl-whitelist.inc";
+    exceptions = "file://$CONFDIR/2tld.inc";
+    
+    rule {
+        suffix = "multi.surbl.org";
+        symbol = "SURBL_MULTI";
+        bits {
+            JP_SURBL_MULTI = 64;
+            AB_SURBL_MULTI = 32;
+            OB_SURBL_MULTI = 16;
+            PH_SURBL_MULTI = 8;
+            WS_SURBL_MULTI = 4;
+            SC_SURBL_MULTI = 2;
+        }
+    }
+    rule {
+        suffix = "multi.uribl.com";
+        symbol = "URIBL_MULTI";
+        bits {
+            URIBL_BLACK = 2;
+            URIBL_GREY = 4;
+            URIBL_RED = 8;
+        }
+    }
+    rule {
+        suffix = "uribl.rambler.ru";
+        symbol = "RAMBLER_URIBL";
+    }
+    rule {
+        suffix = "dbl.spamhaus.org";
+        symbol = "DBL";
+        options = "noip";
+    }
 }
 rbl {
     default_received = false;
@@ -70,24 +70,24 @@ rbl {
     spamhaus_zen {
        symbol = "RBL_ZEN";
        rbl = "zen.spamhaus.org";
-          ipv4 = true;
-          ipv6 = true;
+       ipv4 = true;
+       ipv6 = true;
     }
     spamhaus_pbl {
        symbol = "RECEIVED_PBL";
        rbl = "pbl.spamhaus.org";
-          ipv4 = true;
-          ipv6 = true;
-          received = true;
-          from = false;
+       ipv4 = true;
+       ipv6 = true;
+       received = true;
+       from = false;
     }
     spamhaus_pbl {
        symbol = "RECEIVED_XBL";
        rbl = "xbl.spamhaus.org";
-          ipv4 = true;
-          ipv6 = true;
-          received = true;
-          from = false;
+       ipv4 = true;
+       ipv6 = true;
+       received = true;
+       from = false;
     }
     mailspike {
        symbol = "RBL_MAILSPIKE";
@@ -113,21 +113,21 @@ once_received {
 }
 multimap {
     spamhaus { 
-               type = "dnsbl"; 
-               map = "pbl.spamhaus.org"; 
-               symbol = "R_IP_PBL"; 
-               description = "PBL dns block list"; 
-       }
+        type = "dnsbl"; 
+        map = "pbl.spamhaus.org"; 
+        symbol = "R_IP_PBL"; 
+        description = "PBL dns block list"; 
+    }
 }
 phishing {
     symbol = "PHISHING";
 }
 emails {
     rule { 
-               symbol = RAMBLER_EMAILBL;
-               dnsbl = email-bl.rambler.ru;
-               domain_only = false;
-       }
+        symbol = RAMBLER_EMAILBL;
+        dnsbl = email-bl.rambler.ru;
+        domain_only = false;
+    }
 }
 spf {
     spf_cache_size = 2k;