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 shenanigans with multiples and global_config edit

Browse source
This commit is contained in:
Théophile Diot 2024-03-21 13:39:00 +00:00
parent bec0036020
commit 04d536cd7e
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -797,6 +797,7 @@ class Database:
db_ids[server_name] = {"method": method, "is_draft": server_name in drafts}
key = key.replace(f"{server_name}_", "")
original_key = original_key.replace(f"{server_name}_", "")
setting = session.query(Settings).with_entities(Settings.default).filter_by(id=key).first()
if not setting:
@ -814,7 +815,9 @@ class Database:
)
if not service_setting:
if key != "SERVER_NAME" and ((key not in config and value == setting.default) or (key in config and value == config[key])):
if key != "SERVER_NAME" and (
(original_key not in config and value == setting.default) or (original_key in config and value == config[original_key])
):
continue
to_put.append(
@ -827,7 +830,9 @@ class Database:
)
)
elif method in (service_setting.method, "autoconf") and service_setting.value != value:
if key != "SERVER_NAME" and ((key not in config and value == setting.default) or (key in config and value == config[key])):
if key != "SERVER_NAME" and (
(original_key not in config and value == setting.default) or (original_key in config and value == config[original_key])
):
session.query(Services_settings).filter(
Services_settings.service_id == server_name,
Services_settings.setting_id == key,

2
src/ui/main.py
View file

@ -1030,7 +1030,7 @@ def global_config():
for variable, value in variables.copy().items():
for service in services:
setting = config.get(f"{service}_{variable}", None)
if setting and setting["global"] and value != setting["value"]:
if setting and setting["global"] and (setting["value"] != value or setting["value"] == config.get(variable, {"value": None})["value"]):
variables[f"{service}_{variable}"] = value
# Reload instances

19
src/ui/src/Config.py
View file

@ -9,7 +9,7 @@ from json import loads as json_loads
from pathlib import Path
from re import search as re_search
from subprocess import run, DEVNULL, STDOUT
from typing import List, Literal, Tuple
from typing import List, Literal, Optional, Tuple
from uuid import uuid4
@ -18,7 +18,7 @@ class Config:
self.__settings = json_loads(Path(sep, "usr", "share", "bunkerweb", "settings.json").read_text(encoding="utf-8"))
self.__db = db
def __gen_conf(self, global_conf: dict, services_conf: list[dict], *, check_changes: bool = True, global_edit: bool = False) -> None:
def __gen_conf(self, global_conf: dict, services_conf: list[dict], *, check_changes: bool = True, changed_service: Optional[str] = None) -> None:
"""Generates the nginx configuration file from the given configuration
Parameters
@ -40,11 +40,12 @@ class Config:
if not server_name:
continue
for k in service:
key_without_suffix = k.rsplit("_", 1)[0] if re_search(r"_\d+$", k) else k
if plugins_settings[key_without_suffix]["context"] == "multisite":
if not global_edit or f"{server_name}_{k}" not in conf:
conf[f"{server_name}_{k}"] = service[k]
for k, v in service.items():
if server_name != changed_service and f"{server_name}_{k}" in conf:
continue
if plugins_settings[k.rsplit("_", 1)[0] if re_search(r"_\d+$", k) else k]["context"] == "multisite":
conf[f"{server_name}_{k}"] = v
servers.append(server_name)
@ -223,7 +224,7 @@ class Config:
if k.startswith(old_server_name_splitted[0]):
config.pop(k)
self.__gen_conf(config, services, check_changes=check_changes)
self.__gen_conf(config, services, check_changes=check_changes, changed_service=variables["SERVER_NAME"])
return f"Configuration for {old_server_name_splitted[0]} has been edited.", 0
def edit_global_conf(self, variables: dict) -> str:
@ -239,7 +240,7 @@ class Config:
str
the confirmation message
"""
self.__gen_conf(self.get_config(methods=False) | variables, self.get_services(methods=False), global_edit=True)
self.__gen_conf(self.get_config(methods=False) | variables, self.get_services(methods=False))
return "The global configuration has been edited."
def delete_service(self, service_name: str, *, check_changes: bool = True) -> Tuple[str, int]: