Correct "file.conf" from dist config files

diff --git a/conf/common.conf b/conf/common.conf
index 953e56456defd4fd6c1ccf76a6949841126b361d..7b3609fbb805199a527aabb67daac45828d3234f 100644 (file)
--- a/conf/common.conf
+++ b/conf/common.conf
@@ -8,10 +8,6 @@
 # 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/developers/writing_rules.html for details
 
 lua = "$RULESDIR/rspamd.lua"

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 30ede54b15ae5638e538e00e8dd91920c603398b..daf1139f1b41b1a9cb16c4bf0f07821ede6fdadf 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -9,8 +9,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/metrics.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/metrics.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/modules.conf b/conf/modules.conf
index fbad4c81687a7d941fa36f7d502a1628c448093b..42fc0419eb04efbc5809e6316510e936660bb87b 100644 (file)
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -9,10 +9,10 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/modules.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/modules.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 
 .include(glob=true) "${CONFDIR}/modules.d/*.conf"
-.include(try=true, glob=true) "${CONFDIR}/modules.local.d/*.conf"
\ No newline at end of file
+.include(try=true, glob=true) "${CONFDIR}/modules.local.d/*.conf"

diff --git a/conf/rspamd.conf b/conf/rspamd.conf
index d0c5d3c23d3882d081af614c5fd4a05f237f99a5..6f07e7eec8da9382569edbd40c3af4bb41ef54a5 100644 (file)
--- a/conf/rspamd.conf
+++ b/conf/rspamd.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/rspamd.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/rspamd.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/content_group.conf b/conf/scores.d/content_group.conf
index 50030925ea42da887eb4ea3d555223dbc6bf001b..9bb87932c8ef6712e48d271e3e941265d21b8251 100644 (file)
--- a/conf/scores.d/content_group.conf
+++ b/conf/scores.d/content_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/content_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/content_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/fuzzy_group.conf b/conf/scores.d/fuzzy_group.conf
index c9f02dae31dcf747d5f0b7fbc52f4dd88479c794..0bab0ca0a80f089f1be30aa26c562d2c36171cf4 100644 (file)
--- a/conf/scores.d/fuzzy_group.conf
+++ b/conf/scores.d/fuzzy_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/fuzzy_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/fuzzy_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 
@@ -34,4 +34,4 @@ symbols = {
         weight = -2.1;
         description = "Whitelisted fuzzy hash, bl.rspamd.com";
     }
-}
\ No newline at end of file
+}

diff --git a/conf/scores.d/headers_group.conf b/conf/scores.d/headers_group.conf
index 6ffdc59a7d7830a48f8c6c26ed2311d7cdf2eae5..2c2ebd9d45ad44584db19412b5d7e5f46fb980d0 100644 (file)
--- a/conf/scores.d/headers_group.conf
+++ b/conf/scores.d/headers_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/headers_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/headers_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/hfilter_group.conf b/conf/scores.d/hfilter_group.conf
index d405d81400613b42fe599cc47dd2ed77afafa289..646c1cd2a377a32596b89616e54def252d1d5fdd 100644 (file)
--- a/conf/scores.d/hfilter_group.conf
+++ b/conf/scores.d/hfilter_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/hfilter_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/hfilter_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/mime_types_group.conf b/conf/scores.d/mime_types_group.conf
index 7fdc73cce5460d36eb4ab9a8fedac881f1287381..7df1c9ba1f7e60fd7a07232eac05825a7dd9143f 100644 (file)
--- a/conf/scores.d/mime_types_group.conf
+++ b/conf/scores.d/mime_types_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/mime_types_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/mime_types_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/mua_group.conf b/conf/scores.d/mua_group.conf
index 24497474b86cb6af57326c32ed38fdddb96abddd..4eb50e965b7e44d4cb360561ac4fd39a088ccebe 100644 (file)
--- a/conf/scores.d/mua_group.conf
+++ b/conf/scores.d/mua_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/mua_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/mua_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 
@@ -22,4 +22,4 @@ symbols = {
         weight = 0.0;
         description = "Avoid false positives for FORGED_MUA_* in maillist";
     }
-}
\ No newline at end of file
+}

diff --git a/conf/scores.d/phishing_group.conf b/conf/scores.d/phishing_group.conf
index c10f4178176799007807696240b87a49f7116e3d..d929f8fbe5380313c22083e76bf9904149e89192 100644 (file)
--- a/conf/scores.d/phishing_group.conf
+++ b/conf/scores.d/phishing_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/phishing_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/phishing_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/policies_group.conf b/conf/scores.d/policies_group.conf
index 06739a8d36dbf5f8f76f8a3217991c10acdbc182..865aa783c0b5f515529368182ed5d49d0666d369 100644 (file)
--- a/conf/scores.d/policies_group.conf
+++ b/conf/scores.d/policies_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/policies_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/policies_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index c5bc7cb0dc5ed11e7a745febc8709cb609b3df33..795ea9efd04be34527b1a098d2465236eb9b6cd7 100644 (file)
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/rbl_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/rbl_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/statistics_group.conf b/conf/scores.d/statistics_group.conf
index b889da74f8f5f71b4b0fba44e1d32b64546106ff..1556b867c56bc0e0f82572d4f0a9553591b82321 100644 (file)
--- a/conf/scores.d/statistics_group.conf
+++ b/conf/scores.d/statistics_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/statistics_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/statistics_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/subject_group.conf b/conf/scores.d/subject_group.conf
index 4a6d1a6175dfbdc578117489156d0135a21b554c..8c9b70033764777556625ca82356e6f683061333 100644 (file)
--- a/conf/scores.d/subject_group.conf
+++ b/conf/scores.d/subject_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/subject_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/subject_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/surbl_group.conf b/conf/scores.d/surbl_group.conf
index e51ba6dcfbe0a633ca8fa4fac55fad073f492ab1..d0cb97009bb758423b51b952ae12f5836881d762 100644 (file)
--- a/conf/scores.d/surbl_group.conf
+++ b/conf/scores.d/surbl_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/surbl_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/surbl_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details
 

diff --git a/conf/scores.d/whitelist_group.conf b/conf/scores.d/whitelist_group.conf
index 6d071b603ba82faea2ad71ef15302d1c26d82483..b80a1f8847fd8509079574e9ac578635042e05ab 100644 (file)
--- a/conf/scores.d/whitelist_group.conf
+++ b/conf/scores.d/whitelist_group.conf
@@ -10,8 +10,8 @@
 # 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
+# '$LOCAL_CONFDIR/local.d/whitelist_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/whitelist_group.conf' - to override the defaults
 #
 # See https://rspamd.com/doc/developers/writing_rules.html for details