SURBL: Divorce config from RBL config

2 files changed, 156 insertions, 157 deletions

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
new file mode 100644
index 000000000..8b150371b
--- /dev/null
+++ b/conf/modules.d/rbl.conf
@@ -0,0 +1,156 @@
+rbl {
+
+    default_from = true;
+    default_received = false;
+    default_exclude_users = 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";
+
+    rbls {
+
+        spamhaus {
+            symbol = "RBL_SPAMHAUS";
+            rbl = "zen.spamhaus.org";
+            ipv6 = true;
+            unknown = 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";
+            rbl = "xbl.spamhaus.org";
+            ipv6 = true;
+            received = true;
+            from = false;
+            ignore_whitelists = true;
+        }
+
+        spamhaus_swl {
+            symbol = "RWL_SPAMHAUS_WL";
+            rbl = "swl.spamhaus.org";
+            ipv6 = true;
+            is_whitelist = true;
+            unknown = true;
+            whitelist_exception = "RWL_SPAMHAUS_WL";
+            returncodes {
+                RWL_SPAMHAUS_WL_IND = "127.0.2.2";
+                RWL_SPAMHAUS_WL_TRANS = "127.0.2.3";
+                RWL_SPAMHAUS_WL_IND_EXP = "127.0.2.102";
+                RWL_SPAMHAUS_WL_TRANS_EXP = "127.0.2.103";
+            }
+        }
+
+        mailspike_bl {
+            symbol = "RBL_MAILSPIKE";
+            unknown = true;
+            rbl = "bl.mailspike.net";
+            returncodes {
+                RBL_MAILSPIKE_ZOMBIE = "127.0.0.2";
+                RBL_MAILSPIKE_WORST = "127.0.0.10";
+                RBL_MAILSPIKE_VERYBAD = "127.0.0.11";
+                RBL_MAILSPIKE_BAD = "127.0.0.12";
+            }
+        }
+
+        mailspike_wl {
+            symbol = "RWL_MAILSPIKE";
+            rbl = "wl.mailspike.net";
+            is_whitelist = true;
+            unknown = true;
+            whitelist_exception = "RWL_MAILSPIKE";
+            whitelist_exception = "RWL_MAILSPIKE_GOOD";
+            whitelist_exception = "RWL_MAILSPIKE_POSSIBLE";
+            returncodes {
+                RWL_MAILSPIKE_POSSIBLE = "127.0.0.17";
+                RWL_MAILSPIKE_GOOD = "127.0.0.18";
+                RWL_MAILSPIKE_VERYGOOD = "127.0.0.19";
+                RWL_MAILSPIKE_EXCELLENT = "127.0.0.20";
+            }
+        }
+
+        senderscore {
+            symbol = "RBL_SENDERSCORE";
+            rbl = "bl.score.senderscore.com";
+        }
+
+        abusech {
+            symbol = "RBL_ABUSECH";
+            rbl = "spam.abuse.ch";
+        }
+
+        uceprotect1 {
+            symbol = "RBL_UCEPROTECT_LEVEL1";
+            rbl = "dnsbl-1.uceprotect.net";
+        }
+
+        sorbs {
+            symbol = "RBL_SORBS";
+            rbl = "dnsbl.sorbs.net";
+            unknown = true;
+            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";
+            }
+        }
+
+        sem {
+            symbol = "RBL_SEM";
+            rbl = "bl.spameatingmonkey.net";
+        }
+
+        semIPv6 {
+            symbol = "RBL_SEM_IPV6";
+            rbl = "bl.ipv6.spameatingmonkey.net";
+            ipv4 = false;
+            ipv6 = true;
+        }
+
+        dnswl {
+            symbol = "RCVD_IN_DNSWL";
+            rbl = "list.dnswl.org";
+            ipv6 = true;
+            is_whitelist = true;
+            unknown = true;
+            whitelist_exception = "RCVD_IN_DNSWL";
+            whitelist_exception = "RCVD_IN_DNSWL_NONE";
+            whitelist_exception = "RCVD_IN_DNSWL_LOW";
+            whitelist_exception = "DNSWL_BLOCKED";
+            returncodes {
+                RCVD_IN_DNSWL_NONE = "127.0.%d+.0";
+                RCVD_IN_DNSWL_LOW = "127.0.%d+.1";
+                RCVD_IN_DNSWL_MED = "127.0.%d+.2";
+                RCVD_IN_DNSWL_HI = "127.0.%d+.3";
+                DNSWL_BLOCKED = "127.0.0.255";
+            }
+        }
+
+        rambleremails {
+            symbol = RAMBLER_EMAILBL;
+            rbl = "email-bl.rambler.ru";
+            from = false;
+            emails = true;
+            exclude_users = false;
+            exclude_private_ips = false;
+            exclude_local = false;
+            ignore_whitelists = true;
+        }
+
+    }
+}
diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index 7bb56b364..ed233ea9e 100644
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -80,160 +80,3 @@ surbl {
         no_ip = true;
     }
 }
-
-rbl {
-
-    default_from = true;
-    default_received = false;
-    default_exclude_users = 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";
-
-    rbls {
-
-        spamhaus {
-            symbol = "RBL_SPAMHAUS";
-            rbl = "zen.spamhaus.org";
-            ipv6 = true;
-            unknown = 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";
-            rbl = "xbl.spamhaus.org";
-            ipv6 = true;
-            received = true;
-            from = false;
-            ignore_whitelists = true;
-        }
-
-        spamhaus_swl {
-            symbol = "RWL_SPAMHAUS_WL";
-            rbl = "swl.spamhaus.org";
-            ipv6 = true;
-            is_whitelist = true;
-            unknown = true;
-            whitelist_exception = "RWL_SPAMHAUS_WL";
-            returncodes {
-                RWL_SPAMHAUS_WL_IND = "127.0.2.2";
-                RWL_SPAMHAUS_WL_TRANS = "127.0.2.3";
-                RWL_SPAMHAUS_WL_IND_EXP = "127.0.2.102";
-                RWL_SPAMHAUS_WL_TRANS_EXP = "127.0.2.103";
-            }
-        }
-
-        mailspike_bl {
-            symbol = "RBL_MAILSPIKE";
-            unknown = true;
-            rbl = "bl.mailspike.net";
-            returncodes {
-                RBL_MAILSPIKE_ZOMBIE = "127.0.0.2";
-                RBL_MAILSPIKE_WORST = "127.0.0.10";
-                RBL_MAILSPIKE_VERYBAD = "127.0.0.11";
-                RBL_MAILSPIKE_BAD = "127.0.0.12";
-            }
-        }
-
-        mailspike_wl {
-            symbol = "RWL_MAILSPIKE";
-            rbl = "wl.mailspike.net";
-            is_whitelist = true;
-            unknown = true;
-            whitelist_exception = "RWL_MAILSPIKE";
-            whitelist_exception = "RWL_MAILSPIKE_GOOD";
-            whitelist_exception = "RWL_MAILSPIKE_POSSIBLE";
-            returncodes {
-                RWL_MAILSPIKE_POSSIBLE = "127.0.0.17";
-                RWL_MAILSPIKE_GOOD = "127.0.0.18";
-                RWL_MAILSPIKE_VERYGOOD = "127.0.0.19";
-                RWL_MAILSPIKE_EXCELLENT = "127.0.0.20";
-            }
-        }
-
-        senderscore {
-            symbol = "RBL_SENDERSCORE";
-            rbl = "bl.score.senderscore.com";
-        }
-
-        abusech {
-            symbol = "RBL_ABUSECH";
-            rbl = "spam.abuse.ch";
-        }
-
-        uceprotect1 {
-            symbol = "RBL_UCEPROTECT_LEVEL1";
-            rbl = "dnsbl-1.uceprotect.net";
-        }
-
-        sorbs {
-            symbol = "RBL_SORBS";
-            rbl = "dnsbl.sorbs.net";
-            unknown = true;
-            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";
-            }
-        }
-
-        sem {
-            symbol = "RBL_SEM";
-            rbl = "bl.spameatingmonkey.net";
-        }
-
-        semIPv6 {
-            symbol = "RBL_SEM_IPV6";
-            rbl = "bl.ipv6.spameatingmonkey.net";
-            ipv4 = false;
-            ipv6 = true;
-        }
-
-        dnswl {
-            symbol = "RCVD_IN_DNSWL";
-            rbl = "list.dnswl.org";
-            ipv6 = true;
-            is_whitelist = true;
-            unknown = true;
-            whitelist_exception = "RCVD_IN_DNSWL";
-            whitelist_exception = "RCVD_IN_DNSWL_NONE";
-            whitelist_exception = "RCVD_IN_DNSWL_LOW";
-            whitelist_exception = "DNSWL_BLOCKED";
-            returncodes {
-                RCVD_IN_DNSWL_NONE = "127.0.%d+.0";
-                RCVD_IN_DNSWL_LOW = "127.0.%d+.1";
-                RCVD_IN_DNSWL_MED = "127.0.%d+.2";
-                RCVD_IN_DNSWL_HI = "127.0.%d+.3";
-                DNSWL_BLOCKED = "127.0.0.255";
-            }
-        }
-
-        rambleremails {
-            symbol = RAMBLER_EMAILBL;
-            rbl = "email-bl.rambler.ru";
-            from = false;
-            emails = true;
-            exclude_users = false;
-            exclude_private_ips = false;
-            exclude_local = false;
-            ignore_whitelists = true;
-        }
-
-    }
-}