[Config] Modernize SURBL config

diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index 655f3c572fcc7750a100a71fe58340e54ef1ce75..3a051719bf6f3275273be43bc8f36d188a859432 100644 (file)
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -17,89 +17,87 @@ surbl {
     whitelist = "file://$CONFDIR/surbl-whitelist.inc";
     exceptions = "file://$CONFDIR/2tld.inc";
 
-    rule {
-        suffix = "multi.surbl.org";
-        symbol = "SURBL_MULTI";
-        bits {
-            CRACKED_SURBL = 128; # From February 2016
-            ABUSE_SURBL = 64;
-            MW_SURBL_MULTI = 16;
-            PH_SURBL_MULTI = 8;
-            SURBL_BLOCKED = 1;
+    rules {
+        "SURBL_MULTI" {
+            suffix = "multi.surbl.org";
+            bits {
+                CRACKED_SURBL = 128; # From February 2016
+                ABUSE_SURBL = 64;
+                MW_SURBL_MULTI = 16;
+                PH_SURBL_MULTI = 8;
+                SURBL_BLOCKED = 1;
+            }
         }
-    }
-    rule {
-        suffix = "multi.uribl.com";
-        symbol = "URIBL_MULTI";
-        bits {
-            URIBL_BLOCKED = 1;
-            URIBL_BLACK = 2;
-            URIBL_GREY = 4;
-            URIBL_RED = 8;
+        "URIBL_MULTI" {
+            suffix = "multi.uribl.com";
+            bits {
+                URIBL_BLOCKED = 1;
+                URIBL_BLACK = 2;
+                URIBL_GREY = 4;
+                URIBL_RED = 8;
+            }
         }
-    }
-    rule {
-        suffix = "uribl.rambler.ru";
-        symbol = "RAMBLER_URIBL";
-    }
-    rule {
-        suffix = "dbl.spamhaus.org";
-        symbol = "DBL";
-        no_ip = true;
-        ips = {
-            # spam domain
-            DBL_SPAM = "127.0.1.2";
-            # phish domain
-            DBL_PHISH = "127.0.1.4";
-            # malware domain
-            DBL_MALWARE = "127.0.1.5";
-            # botnet C&C domain
-            DBL_BOTNET = "127.0.1.6";
-            # abused legit spam
-            DBL_ABUSE = "127.0.1.102";
-            # abused spammed redirector domain
-            DBL_ABUSE_REDIR = "127.0.1.103";
-            # abused legit phish
-            DBL_ABUSE_PHISH = "127.0.1.104";
-            # abused legit malware
-            DBL_ABUSE_MALWARE = "127.0.1.105";
-            # abused legit botnet C&C
-            DBL_ABUSE_BOTNET = "127.0.1.106";
-            # error - IP queries prohibited!
-            DBL_PROHIBIT = "127.0.1.255";
+        "RAMBLER_URIBL" {
+            suffix = "uribl.rambler.ru";
         }
-    }
-    rule {
-        suffix = "sbl.spamhaus.org";
-        symbol = "SBL_URIBL";
-        resolve_ip = true;
-        ips {
-            URIBL_SBL = "127.0.0.2";
-            URIBL_SBL_CSS = "127.0.0.3";
+        "DBL" {
+            suffix = "dbl.spamhaus.org";
+            no_ip = true;
+
+            ips = {
+                # spam domain
+                DBL_SPAM = "127.0.1.2";
+                # phish domain
+                DBL_PHISH = "127.0.1.4";
+                # malware domain
+                DBL_MALWARE = "127.0.1.5";
+                # botnet C&C domain
+                DBL_BOTNET = "127.0.1.6";
+                # abused legit spam
+                DBL_ABUSE = "127.0.1.102";
+                # abused spammed redirector domain
+                DBL_ABUSE_REDIR = "127.0.1.103";
+                # abused legit phish
+                DBL_ABUSE_PHISH = "127.0.1.104";
+                # abused legit malware
+                DBL_ABUSE_MALWARE = "127.0.1.105";
+                # abused legit botnet C&C
+                DBL_ABUSE_BOTNET = "127.0.1.106";
+                # error - IP queries prohibited!
+                DBL_PROHIBIT = "127.0.1.255";
+            }
         }
-    }
-    rule {
-        suffix = "uribl.spameatingmonkey.net";
-        symbol = "SEM_URIBL_UNKNOWN";
-        bits {
-            SEM_URIBL = 2;
+
+        "SBL_URIBL" {
+            suffix = "sbl.spamhaus.org";
+            resolve_ip = true;
+            ips {
+                URIBL_SBL = "127.0.0.2";
+                URIBL_SBL_CSS = "127.0.0.3";
+            }
         }
-        no_ip = true;
-    }
-    rule {
-        suffix = "fresh15.spameatingmonkey.net";
-        symbol = "SEM_URIBL_FRESH15_UNKNOWN";
-        bits {
-            SEM_URIBL_FRESH15 = 2;
+
+        "SEM_URIBL_UNKNOWN" {
+            suffix = "uribl.spameatingmonkey.net";
+            bits {
+                SEM_URIBL = 2;
+            }
+            no_ip = true;
         }
-        no_ip = true;
-    }
 
-    rule {
-        symbol = "RBL_SARBL_BAD";
-        suffix = "public.sarbl.org";
-        noip   = true;
-        images = true;
+        "SEM_URIBL_FRESH15_UNKNOWN" {
+            suffix = "fresh15.spameatingmonkey.net";
+            bits {
+                SEM_URIBL_FRESH15 = 2;
+            }
+            no_ip = true;
+        }
+
+        "RBL_SARBL_BAD" {
+            suffix = "public.sarbl.org";
+            noip   = true;
+            images = true;
+        }
     }
 
     .include(try=true,priority=5) "${DBDIR}/dynamic/surbl.conf"