[Conf] Remove surbl parts, fix hash_format attribute

2 files changed, 8 insertions, 107 deletions

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index d6919b655..e92ed945d 100644
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -19,6 +19,12 @@ rbl {
   default_exclude_users = true;
   default_unknown = true;
 
+  url_whitelist = [
+    "https://maps.rspamd.com/rspamd/surbl-whitelist.inc.zst",
+    "${DBDIR}/surbl-whitelist.inc.local",
+    "fallback+file://${CONFDIR}/surbl-whitelist.inc"
+  ];
+
   rbls {
 
     spamhaus {
@@ -163,7 +169,7 @@ rbl {
     RSPAMD_EMAILBL {
       ignore_defaults = true;
       emails_delimiter = ".";
-      hash_type = "base32";
+      hash_format = "base32";
       hash_len = 32;
       rbl = "email.rspamd.com";
       replyto = true;
@@ -232,7 +238,7 @@ rbl {
       urls = true;
       hash = 'blake2';
       hash_len = 32;
-      hash_type = 'base32';
+      hash_format = 'base32';
 
       returncodes = {
         RSPAMD_URIBL = [
diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index a64256f10..89b8842a6 100644
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -1,111 +1,6 @@
 # Deprecated, use RBL module!
 surbl {
-  whitelist = [
-    "https://maps.rspamd.com/rspamd/surbl-whitelist.inc.zst",
-    "${DBDIR}/surbl-whitelist.inc.local",
-    "fallback+file://${CONFDIR}/surbl-whitelist.inc"
-  ];
-
   rules {
-    "SURBL_MULTI" {
-      suffix = "multi.surbl.org";
-      check_dkim = true;
-      check_emails = true;
-      bits {
-        CRACKED_SURBL = 128; # From February 2016
-        ABUSE_SURBL = 64;
-        MW_SURBL_MULTI = 16;
-        PH_SURBL_MULTI = 8;
-        SURBL_BLOCKED = 1;
-      }
-    }
-    "URIBL_MULTI" {
-      suffix = "multi.uribl.com";
-      check_dkim = true;
-      check_emails = true;
-      bits {
-        URIBL_BLOCKED = 1;
-        URIBL_BLACK = 2;
-        URIBL_GREY = 4;
-        URIBL_RED = 8;
-      }
-    }
-    "RSPAMD_URIBL" {
-      suffix = "uribl.rspamd.com";
-      check_dkim = true;
-      check_emails = true;
-      process_script =<<EOD
-function(url, suffix)
-  local cr = require "rspamd_cryptobox_hash"
-  local h = cr.create(url):base32():sub(1, 32)
-  return string.format("%s.%s", h, suffix)
-end
-EOD;
-    }
-    "DBL" {
-      suffix = "dbl.spamhaus.org";
-      no_ip = true;
-      check_emails = true;
-      check_dkim = 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";
-      }
-    }
-
-    "SPAMHAUS_ZEN_URIBL" {
-      suffix = "zen.spamhaus.org";
-      resolve_ip = true;
-      check_emails = true;
-      ips {
-        URIBL_SBL = "127.0.0.2";
-        URIBL_SBL_CSS = "127.0.0.3";
-        URIBL_XBL = ["127.0.0.4", "127.0.0.5", "127.0.0.6", "127.0.0.7"];
-        URIBL_PBL = ["127.0.0.10", "127.0.0.11"];
-        URIBL_DROP = "127.0.0.9";
-      }
-    }
-
-    "SEM_URIBL_UNKNOWN" {
-      suffix = "uribl.spameatingmonkey.net";
-      bits {
-        SEM_URIBL = 2;
-      }
-      no_ip = 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"