[Conf] Update header

diff --git a/conf/modules.d/antivirus.conf b/conf/modules.d/antivirus.conf
index def5a6c7560ab597a3ba4179d77ef7b00716a0e1..570b075e0882190f7baf8ccbba6522ee0c4b7320 100644 (file)
--- 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 5a496bc0a18fe58dea296968aa69fa5ebb16cc89..3a6a383c944cd46c64ee6f3f205f9b3bf6aee8c0 100644 (file)
--- 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 955e6ba33799fb18f1dd21b23c1dfc9af6537b1f..61efd5281c3000bd310b053c69fbc76d147298f1 100644 (file)
--- 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 8112147f08f426c3af065114be079d345fe6c6a0..849c8bd38870bdbf4950e7f9f681e88d2da8860b 100644 (file)
--- 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 98ee47b8279bc52a8d55ce1fb9956fd7d6ec4db2..dc176c664727b62804c706051321ae18ed45c3e4 100644 (file)
--- 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 d7622374a4f1060595b8eda3db5ae34479123e36..22ca6007a5bc9eaef3d40ea34324360852005410 100644 (file)
--- 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 c57b57d1466053cd52f79c21c256b92695be4e6f..689ecd2a85c3c97a6c38c455be49b86c7ce7df6e 100644 (file)
--- 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 07e5c7c923bfc8a6399223e3302c53c32357bc4f..6577735d53f0bdb519b645e6686d1aac390ff4d0 100644 (file)
--- 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 bd1b74b9702fda6f816d4aefb50c4323e82abe22..d4870414f711ba92da6481983dd9130f18149b09 100644 (file)
--- 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 665604278afd3b0f6115c9edd7717303746b5d61..80560237ad76786417f3dee60ae58eb624eef59c 100644 (file)
--- 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 dab752e2a0fd5ecc9c62a5cc479f44be7cfe6c1e..19f750fde77ee834c36fae9f0975a4a093e25470 100644 (file)
--- a/conf/modules.d/emails.conf
+++ b/conf/modules.d/emails.conf
@@ -1,4 +1,6 @@
-# Deprecated! Use rbl module
+# Deprecated, preserved for compatibility purposes! Use rbl module
+# Module documentation https://rspamd.com/doc/modules/rbl.html
+
 emails {
   .include(try=true,priority=5) "${DBDIR}/dynamic/emails.conf"
   .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/emails.conf"

diff --git a/conf/modules.d/external_services.conf b/conf/modules.d/external_services.conf
index 98c79b4d03786364973a74d589623e02117417ba..549c7d768e910e2aabd285772152112dfebcd3a1 100644 (file)
--- 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 bdb10f51c141d7bbe29fdffd955aaa8d9f401b4e..a753066e0820ec3c5b5bc8f78f84bacc0a7aadd7 100644 (file)
--- 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 510172af5f8c29ab77103e69bc99c7fbd34d5029..b480bb1c403abb7ed91906a357061a9ca4a9993f 100644 (file)
--- 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 6f0fe808c9f96df8bcbdc5622a9887901c526d05..5f02d864bacb3473e0acfdda361c94f07af9873a 100644 (file)
--- 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 f12a228d22ab38c13787a34253c14c66cb76469b..fde9cc09757b1c8be15b6195864114f76b562c6c 100644 (file)
--- a/conf/modules.d/greylist.conf
+++ b/conf/modules.d/greylist.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/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":

diff --git a/conf/modules.d/hfilter.conf b/conf/modules.d/hfilter.conf
index 05b5a604c4e3a775e8c4b94c3c283c4444116ced..36d5f47bbe992ad437e10282eef605ca9f3a0e80 100644 (file)
--- 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 1e170213e41bd1b569578cbf10655227e8e66caa..0d1c7f66f014acb8e42e3a909dd0da6bd63efe5b 100644 (file)
--- 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 f86bf06cc5b0d3c24910b490a452c2e10751c345..3ddd0a664f56a386d19f7675ea109c5647c377b9 100644 (file)
--- 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 2284f7431a064e4622effb0dad316a3cf1c515a1..cd62be57eff6f0fa7753cba2e6bc54f5a3555213 100644 (file)
--- 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 b334d4c5aee6ec721c955e23a84b425490c2b519..8edce1dbf6dcc5bb10014f93b60519b50c598e82 100644 (file)
--- 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 5fd6794638f2a19905965a593d1f83cd314eb2e0..e214a715bb5dadf92224aa9a4c1a1757a7c04d4b 100644 (file)
--- a/conf/modules.d/mid.conf
+++ b/conf/modules.d/mid.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/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 = {

diff --git a/conf/modules.d/milter_headers.conf b/conf/modules.d/milter_headers.conf
index e01d6e0f42ddb9a302a418c351a07769a0a67ab6..eafdaed5596a8f229931e11ef2e1bf03bd23b2f6 100644 (file)
--- 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 ef9ab934b1bfdf16dab244032768aaa0b67aed77..376b70171d504b0dc37f71a70b7169f612053827 100644 (file)
--- a/conf/modules.d/mime_types.conf
+++ b/conf/modules.d/mime_types.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/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 = [

diff --git a/conf/modules.d/multimap.conf b/conf/modules.d/multimap.conf
index 96a523e481fcb9e0a255dc000720227253e4ccc1..d5cd9d228942c235b567fc96ec5a7d8fe60db3d5 100644 (file)
--- 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

diff --git a/conf/modules.d/mx_check.conf b/conf/modules.d/mx_check.conf
index 853ab1e777f6055ea815c5acbfad8f94fd564d63..2068fc575d2a868cc26271f7cb8381486b66a107 100644 (file)
--- 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 d81f36ea250f855c4bd5eddac3228be3ccd460ac..7f3deeb4e308cefb2735ddc13fa01e28f3d55405 100644 (file)
--- 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 c0aaf3330cbc6d3425ed86bd13e5a79cd8814058..ab074929596929ccc35a93fc92af4f4a3b1b8f03 100644 (file)
--- 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
index 721975f2bcddefd49dd94b7b9b6049af074e4c8b..049d4feac568779a0f68a3094316ac7f3e789219 100644 (file)
--- a/conf/modules.d/p0f.conf
+++ b/conf/modules.d/p0f.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/p0f.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/p0f.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/p0f.html
 
 p0f {
   # Disable module by default

diff --git a/conf/modules.d/phishing.conf b/conf/modules.d/phishing.conf
index bdace91232d8a63123b609b03b6cf508ff431324..d62f74da3f2c16aa7b4c77370b2aeb0b1389f591 100644 (file)
--- 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";

diff --git a/conf/modules.d/ratelimit.conf b/conf/modules.d/ratelimit.conf
index 9007c77e944ffefe3fe6722da09811ece7652d97..f168f0261839b429973326c9625e39b957052f0c 100644 (file)
--- 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 1cdd73b2d48b5220ae426e2fab3b707aa0ec66e4..c535a7bf6b89d62338558460414b49e7b1bee6d4 100644 (file)
--- 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;

diff --git a/conf/modules.d/redis.conf b/conf/modules.d/redis.conf
index df71360d0ff647b61757f4b1e5abb153d586fe48..9fec0a2412dce3e08995ec1ddc8e894546c5a345 100644 (file)
--- 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 61514642f7ce30cf72a1515a63ea485a71f3884a..f7d5921c51ede7ef60d33790f41826748ed9c917 100644 (file)
--- 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 d149623ed7ae7748822e60d3ee34f821a50d8a90..a1a85df6e0708aa18507927ee3bb11a79d3e3df6 100644 (file)
--- 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 245be6f9bedd6e090313877415397ca1fc8ba527..fe9d5f71dd11404ca4111eabaa63e942155cb75e 100644 (file)
--- 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 8b0ccf8bac4fea914ac1d56be90572969f91c34d..1b998b2f1fd9088a1d8cd2563748749b38dffa05 100644 (file)
--- 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 09e277866c1fa867f151492a7bcecbcd3159a4c0..05444307118d44988b75bf6ef7093880cd60abc2 100644 (file)
--- 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 72165e580eb7a78c06711f1b2ed50b642d1116a8..e5665e15ff8491dcdb0cd8791ee06fd2170df0a1 100644 (file)
--- 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 841b63ee8b4d29489043185540abe031217f52a5..5dddecf97fe6d785dc5b8bb00b310c546cc297b9 100644 (file)
--- 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/trie.conf b/conf/modules.d/trie.conf
index 660073f2b28fdad2d6208828fcee269e000139ce..9a1e1caa53f8a4e4728b6ed070efd481d5d2c1ac 100644 (file)
--- 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 a95277efc3c890cff68af73254cbb374a3b1618e..da3b5bb138f72a760a2ef6b66b63f6c93fe504c3 100644 (file)
--- 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/whitelist.conf b/conf/modules.d/whitelist.conf
index b3bbd43293ca887a65296f5ac0bbcc1b862c2c0e..a4b39aa9b88df14812735dc183865c4732c1f1a9 100644 (file)
--- a/conf/modules.d/whitelist.conf
+++ b/conf/modules.d/whitelist.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/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 {