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 filtered_settings argument to use tuple syntax in database queries

Browse source
This commit is contained in:
Théophile Diot 2024-11-14 16:38:17 +01:00
parent 9fa8ab5483
commit 8c926d2132
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/core/letsencrypt/jobs/certbot-deploy.py
View file

@ -34,7 +34,7 @@ try:
db = Database(LOGGER, sqlalchemy_string=getenv("DATABASE_URI", None))
instances = db.get_instances()
services = db.get_non_default_settings(global_only=True, methods=False, with_drafts=True, filtered_settings=("SERVER_NAME"))["SERVER_NAME"].split(" ")
services = db.get_non_default_settings(global_only=True, methods=False, with_drafts=True, filtered_settings=("SERVER_NAME",))["SERVER_NAME"].split(" ")
reload_min_timeout = getenv("RELOAD_MIN_TIMEOUT", "5")

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

@ -2066,7 +2066,7 @@ class Database:
def get_custom_configs(self, *, with_drafts: bool = False, with_data: bool = True, as_dict: bool = False) -> Union[List[Dict[str, Any]], Dict[str, Any]]:
"""Get the custom configs from the database"""
db_config = self.get_non_default_settings(with_drafts=with_drafts, filtered_settings={"USE_TEMPLATE"})
db_config = self.get_non_default_settings(with_drafts=with_drafts, filtered_settings=("USE_TEMPLATE",))
with self._db_session() as session:
entities = [Custom_configs.service_id, Custom_configs.type, Custom_configs.name, Custom_configs.checksum, Custom_configs.method]
@ -2143,7 +2143,7 @@ class Database:
if not db_config:
if service_id:
service_config = self.get_non_default_settings(with_drafts=True, filtered_settings={"USE_TEMPLATE"})
service_config = self.get_non_default_settings(with_drafts=True, filtered_settings=("USE_TEMPLATE",))
if service_config.get(f"{service_id}_USE_TEMPLATE"):
with self._db_session() as session:
template_config = (