librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

Add "global" key to settings when fetching methods as well

This commit is contained in:
Théophile Diot 2023-05-10 13:21:51 -04:00
parent dcdb43cf05
commit 402ff16c82
No known key found for this signature in database
GPG Key ID: E752C80DB72BB014
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/db/Database.py
View File

@ -719,7 +719,7 @@ class Database:
config[setting.id] = (
default
if methods is False
else {"value": default, "method": "default"}
else {"value": default, "global": True, "method": "default"}
)
global_values = (
@ -744,6 +744,7 @@ class Database:
if methods is False
else {
"value": global_value.value,
"global": True,
"method": global_value.method,
}
)
@ -792,13 +793,16 @@ class Database:
if methods is False
else {
"value": service_setting.value,
"global": False,
"method": service_setting.method,
}
)
servers = " ".join(service.id for service in session.query(Services).all())
config["SERVER_NAME"] = (
servers if methods is False else {"value": servers, "method": "default"}
servers
if methods is False
else {"value": servers, "global": True, "method": "default"}
)
return config
@ -846,7 +850,7 @@ class Database:
tmp_config.pop(key)
else:
tmp_config[key] = (
{"value": value["value"], "method": "default"}
{"value": value["value"], "global": True, "method": "default"}
if methods is True
else value
)