Merge branch 'master' into arc-defaults

46 files changed, 547 insertions, 605 deletions

diff --git a/conf/modules.d/antivirus.conf b/conf/modules.d/antivirus.conf
index def5a6c75..570b075e0 100644
--- a/conf/modules.d/antivirus.conf
+++ b/conf/modules.d/antivirus.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/antivirus.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/antivirus.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/antivirus.html
 
 antivirus {
   # multiple scanners could be checked, for each we create a configuration block with an arbitrary name
diff --git a/conf/modules.d/arc.conf b/conf/modules.d/arc.conf
index a57cec00d..48b5e59e9 100644
--- a/conf/modules.d/arc.conf
+++ b/conf/modules.d/arc.conf
@@ -1,14 +1,16 @@
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'local.d/arc.conf' to add and merge
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# You can modify 'override.d/arc.conf' to strictly override all
+# parameters defined inside this section
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
+#
+# Module documentation can be found at  https://rspamd.com/doc/modules/arc.html
 
 
 # To configure this module, please also check the following document:
diff --git a/conf/modules.d/asn.conf b/conf/modules.d/asn.conf
index 955e6ba33..61efd5281 100644
--- a/conf/modules.d/asn.conf
+++ b/conf/modules.d/asn.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/asn.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/asn.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/asn.html
 
 asn {
   # Provider: just "rspamd" for now
diff --git a/conf/modules.d/chartable.conf b/conf/modules.d/chartable.conf
index 8112147f0..849c8bd38 100644
--- a/conf/modules.d/chartable.conf
+++ b/conf/modules.d/chartable.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/chartable.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/chartable.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/chartable.html
 
 chartable {
   threshold = 0.300000;
diff --git a/conf/modules.d/clickhouse.conf b/conf/modules.d/clickhouse.conf
index 98ee47b82..dc176c664 100644
--- a/conf/modules.d/clickhouse.conf
+++ b/conf/modules.d/clickhouse.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/clickhouse.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/clickhouse.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/clickhouse.html
 
 
 clickhouse {
diff --git a/conf/modules.d/dcc.conf b/conf/modules.d/dcc.conf
index d7622374a..22ca6007a 100644
--- a/conf/modules.d/dcc.conf
+++ b/conf/modules.d/dcc.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/dcc.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/dcc.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/dcc.html
 
 dcc {
 
diff --git a/conf/modules.d/dkim.conf b/conf/modules.d/dkim.conf
index c57b57d14..689ecd2a8 100644
--- a/conf/modules.d/dkim.conf
+++ b/conf/modules.d/dkim.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/dkim.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/dkim.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/dkim.html
 
 dkim {
   dkim_cache_size = 2k;
diff --git a/conf/modules.d/dkim_signing.conf b/conf/modules.d/dkim_signing.conf
index 07e5c7c92..6577735d5 100644
--- a/conf/modules.d/dkim_signing.conf
+++ b/conf/modules.d/dkim_signing.conf
@@ -1,17 +1,14 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/dkim_signing.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/dkim_signing.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
-#
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 
 
 # To configure this module, please also check the following document:
diff --git a/conf/modules.d/dmarc.conf b/conf/modules.d/dmarc.conf
index bd1b74b97..d4870414f 100644
--- a/conf/modules.d/dmarc.conf
+++ b/conf/modules.d/dmarc.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/dmarc.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/dmarc.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/dmarc.html
 
 dmarc {
   .include(try=true,priority=5) "${DBDIR}/dynamic/dmarc.conf"
diff --git a/conf/modules.d/elastic.conf b/conf/modules.d/elastic.conf
index 665604278..80560237a 100644
--- a/conf/modules.d/elastic.conf
+++ b/conf/modules.d/elastic.conf
@@ -1,3 +1,17 @@
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
+#
+# You can modify 'local.d/elastic.conf' to add and merge
+# parameters defined inside this section
+#
+# You can modify 'override.d/elastic.conf' to strictly override all
+# parameters defined inside this section
+#
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
+#
+# Module documentation can be found at  https://rspamd.com/doc/modules/elastic.html
+
 elastic {
   # Push update when 10 records are collected (10 if unset)
   limit = 10;
diff --git a/conf/modules.d/emails.conf b/conf/modules.d/emails.conf
index 8511eed2b..19f750fde 100644
--- a/conf/modules.d/emails.conf
+++ b/conf/modules.d/emails.conf
@@ -1,48 +1,7 @@
-# Please don't modify this file as your changes might be overwritten with
-# the next update.
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
-#
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
-#
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Deprecated, preserved for compatibility purposes! Use rbl module
+# Module documentation https://rspamd.com/doc/modules/rbl.html
 
 emails {
-  rules {
-    RSPAMD_EMAILBL {
-      delimiter = ".";
-      encoding = "base32";
-      hashlen = 32;
-      dnsbl = "email.rspamd.com";
-      check_replyto = true;
-      hash = "blake2";
-      returncodes = {
-        RSPAMD_EMAILBL = "127.0.0.2";
-      }
-    }
-    MSBL_EBL {
-      dnsbl = "ebl.msbl.org";
-      domain_only = false;
-      check_replyto = true;
-      hash = "sha1";
-      returncodes = {
-        MSBL_EBL = [
-          "127.0.0.2",
-          "127.0.0.3"
-        ];
-        MSBL_EBL_GREY = [
-          "127.0.1.2",
-          "127.0.1.3"
-        ];
-      }
-    }
-  }
   .include(try=true,priority=5) "${DBDIR}/dynamic/emails.conf"
   .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/emails.conf"
   .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/emails.conf"
diff --git a/conf/modules.d/external_services.conf b/conf/modules.d/external_services.conf
index 98c79b4d0..549c7d768 100644
--- a/conf/modules.d/external_services.conf
+++ b/conf/modules.d/external_services.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/external_services.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/external_services.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/external_services.html
 
 external_services {
   oletools {
diff --git a/conf/modules.d/force_actions.conf b/conf/modules.d/force_actions.conf
index bdb10f51c..a753066e0 100644
--- a/conf/modules.d/force_actions.conf
+++ b/conf/modules.d/force_actions.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/force_actions.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/force_actions.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/force_actions.html
 
 force_actions {
 
diff --git a/conf/modules.d/forged_recipients.conf b/conf/modules.d/forged_recipients.conf
index 510172af5..b480bb1c4 100644
--- a/conf/modules.d/forged_recipients.conf
+++ b/conf/modules.d/forged_recipients.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/forged_recipients.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/forged_recipients.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/forged_recipients.html
 
 forged_recipients {
   symbol_sender = "FORGED_SENDER";
diff --git a/conf/modules.d/fuzzy_check.conf b/conf/modules.d/fuzzy_check.conf
index 6f0fe808c..5f02d864b 100644
--- a/conf/modules.d/fuzzy_check.conf
+++ b/conf/modules.d/fuzzy_check.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/fuzzy_check.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/fuzzy_check.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/fuzzy_check.html
 
 fuzzy_check {
   min_bytes = 1k; # Since small parts and small attachments causes too many FP
diff --git a/conf/modules.d/greylist.conf b/conf/modules.d/greylist.conf
index 70c5a642c..fde9cc097 100644
--- a/conf/modules.d/greylist.conf
+++ b/conf/modules.d/greylist.conf
@@ -1,22 +1,22 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/greylist.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/greylist.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/greylisting.html
 
 greylist {
   # Search "example.com" and "mail.example.com" for "mx.out.mail.example.com":
   whitelist_domains_url = [
     "$LOCAL_CONFDIR/local.d/greylist-whitelist-domains.inc",
+    "$LOCAL_CONFDIR/local.d/maps.d/greylist-whitelist-domains.inc",
   ];
 
   expire = 1d; # 1 day by default
diff --git a/conf/modules.d/hfilter.conf b/conf/modules.d/hfilter.conf
index 05b5a604c..36d5f47bb 100644
--- a/conf/modules.d/hfilter.conf
+++ b/conf/modules.d/hfilter.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/hfilter.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/hfilter.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/hfilter.html
 
 hfilter {
   helo_enabled = true;
diff --git a/conf/modules.d/history_redis.conf b/conf/modules.d/history_redis.conf
index 1e170213e..0d1c7f66f 100644
--- a/conf/modules.d/history_redis.conf
+++ b/conf/modules.d/history_redis.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/history_redis.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/history_redis.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/history_redis.html
 
 history_redis {
   #servers = 127.0.0.1:6379; # Redis server to store history
diff --git a/conf/modules.d/maillist.conf b/conf/modules.d/maillist.conf
index f86bf06cc..3ddd0a664 100644
--- a/conf/modules.d/maillist.conf
+++ b/conf/modules.d/maillist.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/maillist.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/maillist.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/maillist.html
 
 maillist {
   symbol = "MAILLIST";
diff --git a/conf/modules.d/metadata_exporter.conf b/conf/modules.d/metadata_exporter.conf
index 2284f7431..cd62be57e 100644
--- a/conf/modules.d/metadata_exporter.conf
+++ b/conf/modules.d/metadata_exporter.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/metadata_exporter.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/metadata_exporter.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/metadata_exporter.html
 
 metadata_exporter {
 
diff --git a/conf/modules.d/metric_exporter.conf b/conf/modules.d/metric_exporter.conf
index b334d4c5a..8edce1dbf 100644
--- a/conf/modules.d/metric_exporter.conf
+++ b/conf/modules.d/metric_exporter.conf
@@ -1,18 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/metric_exporter.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/metric_exporter.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
-
+# Module documentation can be found at  https://rspamd.com/doc/modules/metric_exporter.html
 metric_exporter {
 
   # Refer to https://rspamd.com/doc/modules/metric_exporter.html for information on configuration
diff --git a/conf/modules.d/mid.conf b/conf/modules.d/mid.conf
index 8c153b6b9..e214a715b 100644
--- a/conf/modules.d/mid.conf
+++ b/conf/modules.d/mid.conf
@@ -1,24 +1,24 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/mid.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/mid.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/mid.html
 
 mid = {
   source = {
     url = [
       "https://maps.rspamd.com/rspamd/mid.inc.zst",
+      "$LOCAL_CONFDIR/local.d/maps.d/mid.inc",
       "$LOCAL_CONFDIR/local.d/mid.inc",
-      "fallback+file://${CONFDIR}/mid.inc"
+      "fallback+file://${CONFDIR}/maps.d/mid.inc"
     ];
   }
 
diff --git a/conf/modules.d/milter_headers.conf b/conf/modules.d/milter_headers.conf
index e01d6e0f4..eafdaed55 100644
--- a/conf/modules.d/milter_headers.conf
+++ b/conf/modules.d/milter_headers.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/milter_headers.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/milter_headers.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/milter_headers.html
 
 milter_headers {
 
diff --git a/conf/modules.d/mime_types.conf b/conf/modules.d/mime_types.conf
index a92f426a3..376b70171 100644
--- a/conf/modules.d/mime_types.conf
+++ b/conf/modules.d/mime_types.conf
@@ -1,23 +1,23 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/mime_types.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/mime_types.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/mime_types.html
 
 mime_types {
   file = [
     "https://maps.rspamd.com/rspamd/mime_types.inc.zst",
+    "$LOCAL_CONFDIR/local.d/maps.d/mime_types.inc.local",
     "${DBDIR}/mime_types.inc.local",
-    "fallback+file://${CONFDIR}/mime_types.inc"
+    "fallback+file://${CONFDIR}/maps.d/mime_types.inc"
   ]
 
   # Match specific extensions to specific content types
diff --git a/conf/modules.d/multimap.conf b/conf/modules.d/multimap.conf
index 540775ee1..d5cd9d228 100644
--- a/conf/modules.d/multimap.conf
+++ b/conf/modules.d/multimap.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/multimap.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/multimap.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/multimap.html
 
 multimap {
   # Freemail Addresses
@@ -77,7 +76,7 @@ multimap {
   disposable_envfrom {
     type = "from";
     filter = "email:domain";
-    map = "https://rspamd.com/freemail/disposable.txt.zst";
+    map = "https://maps.rspamd.com/freemail/disposable.txt.zst";
     symbol = "DISPOSABLE_ENVFROM";
     description = "Envelope From is a Disposable e-mail address";
     score = 0.0;
diff --git a/conf/modules.d/mx_check.conf b/conf/modules.d/mx_check.conf
index 853ab1e77..2068fc575 100644
--- a/conf/modules.d/mx_check.conf
+++ b/conf/modules.d/mx_check.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/mx_check.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/mx_check.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/mx_check.html
 
 # This module is *DISABLED* by default
 # If you need to enable it, then define the following line in
diff --git a/conf/modules.d/neural.conf b/conf/modules.d/neural.conf
index d81f36ea2..7f3deeb4e 100644
--- a/conf/modules.d/neural.conf
+++ b/conf/modules.d/neural.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/neural.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/neural.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/neural.html
 
 neural {
   #servers = 127.0.0.1:6379; # Redis server to store learning data and ANN
diff --git a/conf/modules.d/once_received.conf b/conf/modules.d/once_received.conf
index c0aaf3330..ab0749295 100644
--- a/conf/modules.d/once_received.conf
+++ b/conf/modules.d/once_received.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/once_received.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/once_received.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/once_received.html
 
 once_received {
   good_host = "mail";
diff --git a/conf/modules.d/p0f.conf b/conf/modules.d/p0f.conf
new file mode 100644
index 000000000..049d4feac
--- /dev/null
+++ b/conf/modules.d/p0f.conf
@@ -0,0 +1,45 @@
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
+#
+# You can modify 'local.d/p0f.conf' to add and merge
+# parameters defined inside this section
+#
+# You can modify 'override.d/p0f.conf' to strictly override all
+# parameters defined inside this section
+#
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
+#
+# Module documentation can be found at  https://rspamd.com/doc/modules/p0f.html
+
+p0f {
+  # Disable module by default
+  enabled = false;
+
+  # Path to the unix socket that p0f listens on
+  socket = '/var/run/p0f.sock';
+
+  # Connection timeout
+  timeout = 5s;
+
+  # If defined, insert symbol with lookup results
+  symbol = 'P0F';
+
+  # Patterns to match against results returned by p0f
+  # Symbol will be yielded on OS string, link type or distance matches
+  patterns = {
+    WINDOWS = '^Windows.*';
+    #DSL = '^DSL$';
+    #DISTANCE10 = '^distance:10$';
+  }
+
+  # Cache lifetime in seconds (default - 2 hours)
+  expire = 7200;
+
+  # Cache key prefix
+  prefix = 'p0f';
+
+  .include(try=true,priority=5) "${DBDIR}/dynamic/p0f.conf"
+  .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/p0f.conf"
+  .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/p0f.conf"
+}
diff --git a/conf/modules.d/phishing.conf b/conf/modules.d/phishing.conf
index c86e2af41..d62f74da3 100644
--- a/conf/modules.d/phishing.conf
+++ b/conf/modules.d/phishing.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/phishing.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/phishing.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/phishing.html
 
 phishing {
   symbol = "PHISHING";
@@ -25,8 +24,9 @@ phishing {
   # Make exclusions for known redirectors
   redirector_domains = [
     "https://maps.rspamd.com/rspamd/redirectors.inc.zst:REDIRECTOR_FALSE",
+    "$LOCAL_CONFDIR/local.d/maps.d/redirectors.inc:LOCAL_REDIRECTOR_FALSE",
     "$LOCAL_CONFDIR/local.d/redirectors.inc:LOCAL_REDIRECTOR_FALSE",
-    "fallback+file://${CONFDIR}/redirectors.inc:REDIRECTOR_FALSE"
+    "fallback+file://${CONFDIR}/maps.d/redirectors.inc:REDIRECTOR_FALSE"
   ];
 
   .include(try=true,priority=5) "${DBDIR}/dynamic/phishing.conf"
diff --git a/conf/modules.d/ratelimit.conf b/conf/modules.d/ratelimit.conf
index 9007c77e9..f168f0261 100644
--- a/conf/modules.d/ratelimit.conf
+++ b/conf/modules.d/ratelimit.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/ratelimit.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/ratelimit.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/ratelimit.html
 
 ratelimit {
   #rates {
diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index f8f8d02a1..caaee4b97 100644
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/rbl.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/rbl.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/rbl.html
 
 rbl {
   default_from = true;
@@ -19,36 +18,32 @@ rbl {
   default_exclude_users = true;
   default_unknown = true;
 
+  url_whitelist = [
+    "https://maps.rspamd.com/rspamd/surbl-whitelist.inc.zst",
+    "$LOCAL_CONFDIR/local.d/maps.d/surbl-whitelist.inc.local",
+    "${DBDIR}/surbl-whitelist.inc.local",
+    "fallback+file://${CONFDIR}/maps.d/surbl-whitelist.inc"
+  ];
+
   rbls {
 
     spamhaus {
-      symbol = "RBL_SPAMHAUS";
-      rbl = "zen.spamhaus.org";
-      ipv6 = true;
-      returncodes {
-        RBL_SPAMHAUS_SBL = "127.0.0.2";
-        RBL_SPAMHAUS_CSS = "127.0.0.3";
-        RBL_SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5",
-            "127.0.0.6", "127.0.0.7"];
-        RBL_SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"];
-        RBL_SPAMHAUS_DROP = "127.0.0.9";
-      }
-    }
-
-    spamhaus_received {
-      symbol = "RECEIVED_SPAMHAUS";
+      symbol = "SPAMHAUS"; # Augmented by prefixes
       rbl = "zen.spamhaus.org";
       ipv6 = true;
       received = true;
-      from = false;
-      ignore_whitelists = true;
+      from = true;
+      symbols_prefixes = {
+        received = 'RECEIVED',
+        from = 'RBL',
+      }
       returncodes {
-        RECEIVED_SPAMHAUS_SBL = "127.0.0.2";
-        RECEIVED_SPAMHAUS_CSS = "127.0.0.3";
-        RECEIVED_SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5",
+        SPAMHAUS_SBL = "127.0.0.2";
+        SPAMHAUS_CSS = "127.0.0.3";
+        SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5",
             "127.0.0.6", "127.0.0.7"];
-        RECEIVED_SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"];
-        RECEIVED_SPAMHAUS_DROP = "127.0.0.9";
+        SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"];
+        SPAMHAUS_DROP = "127.0.0.9";
       }
     }
 
@@ -128,18 +123,15 @@ rbl {
     }
 
     blocklistde {
-      symbol = "RBL_BLOCKLISTDE";
-      rbl = "bl.blocklist.de";
-      ipv6 = true;
-    }
-
-    blocklistde_received {
-      symbol = "RECEIVED_BLOCKLISTDE";
+      symbols_prefixes = {
+        received = 'RECEIVED',
+        from = 'RBL',
+      }
+      symbol = "BLOCKLISTDE";
       rbl = "bl.blocklist.de";
       ipv6 = true;
       received = true;
-      from = false;
-      ignore_whitelists = true;
+      from = true;
     }
 
     dnswl_dwl {
@@ -159,6 +151,167 @@ rbl {
         DWL_DNSWL_BLOCKED = "127.0.0.255";
       }
     }
+    # Old emails module
+    RSPAMD_EMAILBL {
+      ignore_defaults = true;
+      emails_delimiter = ".";
+      hash_format = "base32";
+      hash_len = 32;
+      rbl = "email.rspamd.com";
+      replyto = true;
+      hash = "blake2";
+      returncodes = {
+        RSPAMD_EMAILBL = "127.0.0.2";
+      }
+    }
+    MSBL_EBL {
+      ignore_defaults = true;
+      rbl = "ebl.msbl.org";
+      emails_domainonly = false;
+      replyto = true;
+      hash = "sha1";
+      returncodes = {
+        MSBL_EBL = [
+          "127.0.0.2",
+          "127.0.0.3"
+        ];
+        MSBL_EBL_GREY = [
+          "127.0.1.2",
+          "127.0.1.3"
+        ];
+      }
+    }
+    # Old SURBL module
+    "SURBL_MULTI" {
+      ignore_defaults = true;
+      rbl = "multi.surbl.org";
+      dkim = true;
+      emails = true;
+      emails_domainonly = true;
+      urls = true;
+
+      returnbits = {
+        CRACKED_SURBL = 128; # From February 2016
+        ABUSE_SURBL = 64;
+        MW_SURBL_MULTI = 16;
+        PH_SURBL_MULTI = 8;
+        SURBL_BLOCKED = 1;
+      }
+    }
+
+    "URIBL_MULTI" {
+      ignore_defaults = true;
+      rbl = "multi.uribl.com";
+      dkim = true;
+      emails = true;
+      emails_domainonly = true;
+      urls = true;
+
+      returnbits {
+        URIBL_BLOCKED = 1;
+        URIBL_BLACK = 2;
+        URIBL_GREY = 4;
+        URIBL_RED = 8;
+      }
+    }
+
+    "RSPAMD_URIBL" {
+      ignore_defaults = true;
+      rbl = "uribl.rspamd.com";
+      dkim = true;
+      emails = true;
+      emails_domainonly = true;
+      urls = true;
+      hash = 'blake2';
+      hash_len = 32;
+      hash_format = 'base32';
+
+      returncodes = {
+        RSPAMD_URIBL = [
+          "127.0.0.2",
+        ];
+      }
+    }
+
+    "DBL" {
+      ignore_defaults = true;
+      rbl = "dbl.spamhaus.org";
+      no_ip = true;
+      dkim = true;
+      emails = true;
+      emails_domainonly = true;
+      urls = true;
+
+      returncodes = {
+        # 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";
+      }
+    }
+
+    # Not enabled by default due to privacy concerns! (see also groups.d/surbl_group.conf)
+    #"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" {
+      ignore_defaults = true;
+      rbl = "uribl.spameatingmonkey.net";
+      no_ip = true;
+      dkim = true;
+      emails = true;
+      emails_domainonly = true;
+      urls = true;
+      returnbits {
+        SEM_URIBL = 2;
+      }
+    }
+
+    "SEM_URIBL_FRESH15_UNKNOWN" {
+      ignore_defaults = true;
+      rbl = "fresh15.spameatingmonkey.net";
+      no_ip = true;
+      dkim = true;
+      emails = true;
+      emails_domainonly = true;
+      urls = true;
+      returnbits {
+        SEM_URIBL_FRESH15 = 2;
+      }
+    }
+
+    # Proved to be broken
+    #"RBL_SARBL_BAD" {
+    #  suffix = "public.sarbl.org";
+    #  noip   = true;
+    #  images = true;
+    #}
   }
 
   .include(try=true,priority=5) "${DBDIR}/dynamic/rbl.conf"
diff --git a/conf/modules.d/redis.conf b/conf/modules.d/redis.conf
index df71360d0..9fec0a241 100644
--- a/conf/modules.d/redis.conf
+++ b/conf/modules.d/redis.conf
@@ -1,15 +1,14 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/redis.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/redis.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
 # See https://rspamd.com/doc/configuration/redis.html
 
diff --git a/conf/modules.d/regexp.conf b/conf/modules.d/regexp.conf
index 61514642f..f7d5921c5 100644
--- a/conf/modules.d/regexp.conf
+++ b/conf/modules.d/regexp.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/regexp.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/regexp.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/regexp.html
 
 regexp {
   max_size = 1M;
diff --git a/conf/modules.d/replies.conf b/conf/modules.d/replies.conf
index d149623ed..a1a85df6e 100644
--- a/conf/modules.d/replies.conf
+++ b/conf/modules.d/replies.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/replies.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/replies.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/replies.html
 
 replies {
   # This setting is non-default & is required to be set
diff --git a/conf/modules.d/reputation.conf b/conf/modules.d/reputation.conf
index 245be6f9b..fe9d5f71d 100644
--- a/conf/modules.d/reputation.conf
+++ b/conf/modules.d/reputation.conf
@@ -1,21 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/reputation.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/reputation.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
-
-
-# Reputation module is experimental! (you need to enable experimental modules
-# explicitly in options by setting `enable_experimental = true`)
+# Module documentation can be found at  https://rspamd.com/doc/modules/reputation.html
 
 reputation {
 #  rules {
diff --git a/conf/modules.d/rspamd_update.conf b/conf/modules.d/rspamd_update.conf
index 8b0ccf8ba..1b998b2f1 100644
--- a/conf/modules.d/rspamd_update.conf
+++ b/conf/modules.d/rspamd_update.conf
@@ -1,17 +1,19 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/rspamd_update.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/rspamd_update.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/rspamd_update.html
+
+# This module is disabled by default, please don't enable it unless you know
+# what are you doing!
 
 rspamd_update {
   rules = "sign+https://updates.rspamd.com/rspamd-${BRANCH_VERSION}.ucl";
diff --git a/conf/modules.d/spamassassin.conf b/conf/modules.d/spamassassin.conf
index 09e277866..054443071 100644
--- a/conf/modules.d/spamassassin.conf
+++ b/conf/modules.d/spamassassin.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/spamassassin.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/spamassassin.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/spamassassin.html
 
 spamassassin {
   # This config defines no SA files leaving this module efficiently disabled by default
diff --git a/conf/modules.d/spamtrap.conf b/conf/modules.d/spamtrap.conf
index 72165e580..e5665e15f 100644
--- a/conf/modules.d/spamtrap.conf
+++ b/conf/modules.d/spamtrap.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/spamtrap.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/spamtrap.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/spamtrap.html
 
 # This module is *DISABLED* by default
 # If you need to enable it, then define the following line in
diff --git a/conf/modules.d/spf.conf b/conf/modules.d/spf.conf
index 841b63ee8..5dddecf97 100644
--- a/conf/modules.d/spf.conf
+++ b/conf/modules.d/spf.conf
@@ -1,18 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/spf.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/spf.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
-
+# Module documentation can be found at  https://rspamd.com/doc/modules/spf.html
 spf {
   spf_cache_size = 2k;
   spf_cache_expire = 1d;
diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index bc7f47791..89b8842a6 100644
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -1,125 +1,6 @@
-# Please don't modify this file as your changes might be overwritten with
-# the next update.
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
-#
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
-#
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
-
+# 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"
diff --git a/conf/modules.d/trie.conf b/conf/modules.d/trie.conf
index 660073f2b..9a1e1caa5 100644
--- a/conf/modules.d/trie.conf
+++ b/conf/modules.d/trie.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/trie.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/trie.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/trie.html
 
 trie {
   # Each subsection defines a single rule with associated symbol
diff --git a/conf/modules.d/url_redirector.conf b/conf/modules.d/url_redirector.conf
index a95277efc..da3b5bb13 100644
--- a/conf/modules.d/url_redirector.conf
+++ b/conf/modules.d/url_redirector.conf
@@ -1,17 +1,16 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/url_redirector.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/url_redirector.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/url_redirector.html
 
 url_redirector {
   expire = 1d; # 1 day by default
diff --git a/conf/modules.d/url_reputation.conf b/conf/modules.d/url_reputation.conf
deleted file mode 100644
index 6bc347311..000000000
--- a/conf/modules.d/url_reputation.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# Please don't modify this file as your changes might be overwritten with
-# the next update.
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
-#
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
-#
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
-
-url_reputation {
-  enabled = false; # Please set enabled = true to activate
-
-  # Key prefix for redis - default "Ur."
-  #key_prefix = "Ur.";
-  # Symbols to insert - defaults as shown
-  #symbols {
-  #  white = "URL_REPUTATION_WHITE";
-  #  black = "URL_REPUTATION_BLACK";
-  #  grey = "URL_REPUTATION_GREY";
-  #  neutral = "URL_REPUTATION_NEUTRAL";
-  #}
-  # DKIM/DMARC/SPF allow symbols - defaults as shown
-  #foreign_symbols {
-  #  dmarc = "DMARC_POLICY_ALLOW";
-  #  dkim = "R_DKIM_ALLOW";
-  #  spf = "R_SPF_ALLOW";
-  #}
-  # SURBL metatags to ignore - default as shown
-  #ignore_surbl = ["URIBL_BLOCKED", "DBL_PROHIBIT", "SURBL_BLOCKED"];
-  # Amount of samples required for scoring - default 5
-  #threshold = 5;
-  # Maximum number of TLDs to update reputation on (default 1)
-  #update_limit = 1;
-  # Maximum number of TLDs to query reputation on (default 100)
-  #query_limit = 100;
-  # If true, try to find most 'relevant' URL (default true)
-  #relevance = true;
-
-  .include(try=true,priority=5) "${DBDIR}/dynamic/url_reputation.conf"
-  .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/url_reputation.conf"
-  .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/url_reputation.conf"
-}
diff --git a/conf/modules.d/url_tags.conf b/conf/modules.d/url_tags.conf
deleted file mode 100644
index a1e53e340..000000000
--- a/conf/modules.d/url_tags.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Please don't modify this file as your changes might be overwritten with
-# the next update.
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
-#
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
-#
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
-#
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
-
-url_tags {
-  enabled = false; # Please set enabled = true to activate
-
-  # expiry time for tags - default 1 hour
-  #expire = 1h;
-  # key prefix for redis - default "Ut."
-  #key_prefix = "Ut.";
-  # tags that shouldn't be persisted - default empty
-  #ignore_tags = ["surbl"];
-
-  .include(try=true,priority=5) "${DBDIR}/dynamic/url_tags.conf"
-  .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/url_tags.conf"
-  .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/url_tags.conf"
-}
diff --git a/conf/modules.d/whitelist.conf b/conf/modules.d/whitelist.conf
index aa0da3161..a4b39aa9b 100644
--- a/conf/modules.d/whitelist.conf
+++ b/conf/modules.d/whitelist.conf
@@ -1,25 +1,25 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine
-# parameters defined on the top level
+# You can modify 'local.d/whitelist.conf' to add and merge
+# parameters defined inside this section
 #
-# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
-# parameters defined on the top level
+# You can modify 'override.d/whitelist.conf' to strictly override all
+# parameters defined inside this section
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# Module documentation can be found at  https://rspamd.com/doc/modules/whitelist.html
 
 whitelist {
   rules {
     "WHITELIST_SPF" = {
       valid_spf = true;
       domains = [
+        "$LOCAL_CONFDIR/local.d/maps.d/spf_whitelist.inc.local",
         "${DBDIR}/spf_whitelist.inc.local",
-        "fallback+file://${CONFDIR}/spf_whitelist.inc"
+        "fallback+file://${CONFDIR}/maps.d/spf_whitelist.inc"
       ];
       score = -1.0
       inverse_symbol = "BLACKLIST_SPF";
@@ -28,8 +28,9 @@ whitelist {
     "WHITELIST_DKIM" = {
       valid_dkim = true;
       domains = [
+        "$LOCAL_CONFDIR/local.d/maps.d/dkim_whitelist.inc.local",
         "${DBDIR}/dkim_whitelist.inc.local",
-        "fallback+file://${CONFDIR}/dkim_whitelist.inc"
+        "fallback+file://${CONFDIR}/maps.d/dkim_whitelist.inc"
       ];
       score = -1.0;
       inverse_symbol = "BLACKLIST_DKIM";
@@ -39,8 +40,9 @@ whitelist {
       valid_dkim = true;
       domains = [
         "https://maps.rspamd.com/rspamd/spf_dkim_whitelist.inc.zst",
+        "$LOCAL_CONFDIR/local.d/maps.d/spf_dkim_whitelist.inc.local",
         "${DBDIR}/spf_dkim_whitelist.inc.local",
-        "fallback+file://${CONFDIR}/spf_dkim_whitelist.inc"
+        "fallback+file://${CONFDIR}/maps.d/spf_dkim_whitelist.inc"
       ];
       score = -3.0;
       inverse_symbol = "BLACKLIST_SPF_DKIM";
@@ -49,8 +51,9 @@ whitelist {
       valid_dmarc = true;
       domains = [
         "https://maps.rspamd.com/rspamd/dmarc_whitelist_new.inc.zst",
+        "$LOCAL_CONFDIR/local.d/maps.d/dmarc_whitelist.inc.local",
         "${DBDIR}/dmarc_whitelist.inc.local",
-        "fallback+file://${CONFDIR}/dmarc_whitelist.inc"
+        "fallback+file://${CONFDIR}/maps.d/dmarc_whitelist.inc"
       ];
       score = -7.0;
       inverse_symbol = "BLACKLIST_DMARC";