[Conf] Add language detection configuration

diff --git a/conf/lang_detection.inc b/conf/lang_detection.inc
new file mode 100644 (file)
index 0000000..ca51d2e
--- /dev/null
+++ b/conf/lang_detection.inc
@@ -0,0 +1,10 @@
+# Language detection configuration
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
+#
+# You can modify 'local.d/lang_detection.inc' to add and merge
+# parameters defined inside this section
+#
+# You can modify 'override.d/lang_detection.inc' to strictly override all
+# parameters defined inside this section
+

diff --git a/conf/rspamd.conf b/conf/rspamd.conf
index 115fa54037d0a3676b44339c48f0a7169b3d0df8..8ce93441cc57a17a2e187e0bd91d83ea7a9baced 100644 (file)
--- a/conf/rspamd.conf
+++ b/conf/rspamd.conf
@@ -24,6 +24,12 @@ options {
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"
 }
 
+lang_detection {
+    .include "$CONFDIR/lang_detection.inc"
+    .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/lang_detection.inc"
+    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/lang_detection.inc"
+}
+
 .include(try=true; duplicate=merge) "$CONFDIR/cgp.inc"
 .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/cgp.inc"
 

diff --git a/src/libmime/lang_detection_fasttext.cxx b/src/libmime/lang_detection_fasttext.cxx
index d6bd96ca16e294ff31cf62593d3570bdd27a7e81..9ede47a6edc0904254ca7b849cc200b4a035f73d 100644 (file)
--- a/src/libmime/lang_detection_fasttext.cxx
+++ b/src/libmime/lang_detection_fasttext.cxx
@@ -45,10 +45,10 @@ private:
 public:
        explicit fasttext_langdet(struct rspamd_config *cfg) {
                const auto *ucl_obj = cfg->rcl_obj;
-               const auto *opts_section = ucl_object_find_key(ucl_obj, "options");
+               const auto *opts_section = ucl_object_find_key(ucl_obj, "lang_detection");
 
                if (opts_section) {
-                       const auto *model = ucl_object_find_key(opts_section, "fasttext_langdet_model");
+                       const auto *model = ucl_object_find_key(opts_section, "fasttext_model");
 
                        if (model) {
                                try {