From 56df6a391d3be586e298367cde5b3ec8479da916 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 22 Apr 2025 03:19:00 +0200
Subject: [PATCH] Correct "file.conf" from dist config files

---
 conf/common.conf                    | 4 ----
 conf/metrics.conf                   | 4 ++--
 conf/modules.conf                   | 6 +++---
 conf/rspamd.conf                    | 4 ++--
 conf/scores.d/content_group.conf    | 4 ++--
 conf/scores.d/fuzzy_group.conf      | 6 +++---
 conf/scores.d/headers_group.conf    | 4 ++--
 conf/scores.d/hfilter_group.conf    | 4 ++--
 conf/scores.d/mime_types_group.conf | 4 ++--
 conf/scores.d/mua_group.conf        | 6 +++---
 conf/scores.d/phishing_group.conf   | 4 ++--
 conf/scores.d/policies_group.conf   | 4 ++--
 conf/scores.d/rbl_group.conf        | 4 ++--
 conf/scores.d/statistics_group.conf | 4 ++--
 conf/scores.d/subject_group.conf    | 4 ++--
 conf/scores.d/surbl_group.conf      | 4 ++--
 conf/scores.d/whitelist_group.conf  | 4 ++--
 17 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/conf/common.conf b/conf/common.conf
index 953e56456d..7b3609fbb8 100644
--- 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 30ede54b15..daf1139f1b 100644
--- 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 fbad4c8168..42fc0419eb 100644
--- 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 d0c5d3c23d..6f07e7eec8 100644
--- 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 50030925ea..9bb87932c8 100644
--- 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 c9f02dae31..0bab0ca0a8 100644
--- 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 6ffdc59a7d..2c2ebd9d45 100644
--- 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 d405d81400..646c1cd2a3 100644
--- 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 7fdc73cce5..7df1c9ba1f 100644
--- 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 24497474b8..4eb50e965b 100644
--- 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 c10f417817..d929f8fbe5 100644
--- 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 06739a8d36..865aa783c0 100644
--- 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 c5bc7cb0dc..795ea9efd0 100644
--- 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 b889da74f8..1556b867c5 100644
--- 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 4a6d1a6175..8c9b700337 100644
--- 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 e51ba6dcfb..d0cb97009b 100644
--- 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 6d071b603b..b80a1f8847 100644
--- 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
 
-- 
2.47.3