Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix database with multisite variables

Browse source
This commit is contained in:
Théophile Diot 2023-08-21 11:53:48 +02:00
parent f24802b211
commit d8c95869e8
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/common/db/Database.py
View file

@ -879,7 +879,13 @@ class Database:
if setting.context == "multisite":
multisite.append(setting.id)
if config.get("MULTISITE", "no") == "yes":
is_multisite = (
config.get("MULTISITE", {"value": "no"})["value"] == "yes"
if methods
else config.get("MULTISITE", "no") == "yes"
)
if is_multisite:
for service in session.query(Services).with_entities(Services.id).all():
checked_settings = []
for key, value in deepcopy(config).items():
@ -926,7 +932,7 @@ class Database:
}
)
if config["MULTISITE"] == "yes":
if is_multisite:
servers = " ".join(
service.id for service in session.query(Services).all()
)
@ -972,19 +978,22 @@ class Database:
for service in session.query(Services).with_entities(Services.id).all()
]
for service in service_names:
service_settings = []
tmp_config = deepcopy(config)
for key, value in deepcopy(tmp_config).items():
if key.startswith(f"{service}_"):
tmp_config[key.replace(f"{service}_", "")] = tmp_config.pop(key)
setting = key.replace(f"{service}_", "")
service_settings.append(setting)
tmp_config[setting] = tmp_config.pop(key)
elif any(key.startswith(f"{s}_") for s in service_names):
tmp_config.pop(key)
else:
elif key not in service_settings:
tmp_config[key] = (
{
"value": value["value"],
"global": True,
"method": "default",
"global": value["global"],
"method": value["method"],
}
if methods is True
else value