searx

Commit Graph

Author	SHA1	Message	Date
Noémi Ványi	967e20dd1e	adjust comment based on previous patch	2021-11-14 17:51:22 +01:00
Noémi Ványi	dff7ee91f9	Check for settings under /etc/searx/settings.yml first The patch introduced earlier broke the behaviour for instance admins running searx from packages. This fix aims to provide compatibility for everyone. Closes #3061	2021-11-14 17:46:01 +01:00
jecarr	3b3fb93074	Add codebase settings.yml to settings_loader.get_user_settings_path()	2021-11-10 16:16:05 +13:00
Markus Heiser	9c10b15096	[fix] settings_loader.py - use update_dict only for mapping types I can't set `default_doi_resolver` in `settings.yml` if I'm using `use_default_settings`. Searx seems to try to interpret all settings at root level in `settings.yml` as dict, which is correct except for `default_doi_resolver` which is at root level and a string:: File "/usr/lib/python3.9/site-packages/searx/settings_loader.py", line 125, in load_settings update_settings(default_settings, user_settings) File "/usr/lib/python3.9/site-packages/searx/settings_loader.py", line 61, in update_settings update_dict(default_settings[k], v) File "/usr/lib/python3.9/site-packages/searx/settings_loader.py", line 48, in update_dict for k, v in user_dict.items(): AttributeError: 'str' object has no attribute 'items' Signed-off-by: Markus Heiser <markus@darmarit.de> Suggested-by: @0xhtml https://github.com/searx/searx/issues/2722#issuecomment-813391659	2021-04-05 16:33:48 +02:00
Alexandre Flament	3f8ebf70b1	[fix] pylint: use "raise ... from ..."	2020-12-20 09:46:53 +01:00
Alexandre Flament	d0d7a3e1c2	[fix] settings_loader: don't crash when a key exists only in the user settings typical use case: result_proxy can be defined in the user settings, but are not defined the default settings.yml	2020-12-03 11:35:12 +01:00
Alexandre Flament	b4b81a5e1a	[enh] settings.yml: add use_default_settings option (2nd version)	2020-11-27 19:40:04 +01:00

7 Commits