mirror of
https://github.com/searxng/searxng.git
synced 2024-08-21 13:50:16 +02:00
Merge pull request #2349 from dalf/fix-settings-loader
[fix] settings_loader: don't crash when a key exists only in the user settings
This commit is contained in:
commit
7905d41487
@ -57,7 +57,10 @@ def update_settings(default_settings, user_settings):
|
||||
# merge everything except the engines
|
||||
for k, v in user_settings.items():
|
||||
if k not in ('use_default_settings', 'engines'):
|
||||
update_dict(default_settings[k], v)
|
||||
if k in default_settings:
|
||||
update_dict(default_settings[k], v)
|
||||
else:
|
||||
default_settings[k] = v
|
||||
|
||||
# parse the engines
|
||||
remove_engines = None
|
||||
|
@ -4,3 +4,6 @@ server:
|
||||
bind_address: "0.0.0.0"
|
||||
default_http_headers:
|
||||
Custom-Header: Custom-Value
|
||||
result_proxy:
|
||||
url : https://localhost/morty
|
||||
key : "$ecretKey"
|
||||
|
Loading…
Reference in New Issue
Block a user