From da28f5280b8f5cac79963e10c79ddc2a3e65f93a Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 27 Oct 2024 07:08:28 +0100
Subject: [PATCH] [fix] limiter: don't hard code settings folder to
/etc/searxng
The location of the local settings depends on environment ``SEARXNG_SETTINGS_PATH``
and can be different from ``/etc/searxng``. Issue was reported on Matrix [1].
To get the location function ``searx.settings_loader.get_user_cfg_folder()``
should be used.
[1] https://matrix.to/#/!vxScbLNEAmRvOraXBn:matrix.org/$_eLS0JpE9oVEWsiGJkqJnWcFWEeZClIMGDK6cWv_Q4g?via=matrix.org&via=tchncs.de&via=envs.net
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
searx/limiter.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/searx/limiter.py b/searx/limiter.py
index 93070dac5..6c1c8894b 100644
--- a/searx/limiter.py
+++ b/searx/limiter.py
@@ -128,9 +128,6 @@ _INSTALLED = False
LIMITER_CFG_SCHEMA = Path(__file__).parent / "limiter.toml"
"""Base configuration (schema) of the botdetection."""
-LIMITER_CFG = Path('/etc/searxng/limiter.toml')
-"""Local Limiter configuration."""
-
CFG_DEPRECATED = {
# "dummy.old.foo": "config 'dummy.old.foo' exists only for tests. Don't use it in your real project config."
}
@@ -138,8 +135,12 @@ CFG_DEPRECATED = {
def get_cfg() -> config.Config:
global CFG # pylint: disable=global-statement
+
if CFG is None:
- CFG = config.Config.from_toml(LIMITER_CFG_SCHEMA, LIMITER_CFG, CFG_DEPRECATED)
+ from . import settings_loader # pylint: disable=import-outside-toplevel
+
+ cfg_file = (settings_loader.get_user_cfg_folder() or Path("/etc/searxng")) / "limiter.toml"
+ CFG = config.Config.from_toml(LIMITER_CFG_SCHEMA, cfg_file, CFG_DEPRECATED)
return CFG