From 861925c50f91f804564c4f6a13de9dfed5fe8e26 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 8 Oct 2021 11:26:59 +0200 Subject: [PATCH] SearXNG: load /etc/searxng/settings.yml fall back to /etc/searx/setting.yml --- searx/settings_loader.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/searx/settings_loader.py b/searx/settings_loader.py index 51e5456d5..f688be8ba 100644 --- a/searx/settings_loader.py +++ b/searx/settings_loader.py @@ -43,8 +43,16 @@ def get_user_settings_path(): if environ.get('SEARXNG_DISABLE_ETC_SETTINGS', '').lower() in ('1', 'true'): return None - # if not, get it from searx code base or last solution from /etc/searx - return check_settings_yml('/etc/searx/settings.yml') + # if not, get it from searx code base or last solution from /etc/searxng + try: + return check_settings_yml('/etc/searxng/settings.yml') + except SearxSettingsException as e: + # fall back to searx settings + try: + return check_settings_yml('/etc/searx/settings.yml') + except SearxSettingsException: + # if none are found, raise the exception about SearXNG + raise e # pylint: disable=raise-missing-from def update_dict(default_dict, user_dict):