From f8a581fd859558f8192c5dda8f3125b0ce706759 Mon Sep 17 00:00:00 2001 From: Lukas Juhrich Date: Mon, 6 May 2024 17:04:33 +0200 Subject: [PATCH] Use toml and env vars for config --- scripts/server_run.py | 5 +++-- web/{flask.cfg => default_config.toml} | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename web/{flask.cfg => default_config.toml} (100%) diff --git a/scripts/server_run.py b/scripts/server_run.py index e2a6f4f0f..b77b68ab9 100755 --- a/scripts/server_run.py +++ b/scripts/server_run.py @@ -7,6 +7,7 @@ import os import sys import time +import tomllib from babel.support import Translations from flask import g, request @@ -38,8 +39,8 @@ def prepare_server(echo=False) -> PycroftFlask: logging.getLogger('pycroft').addHandler(default_handler) app = make_app() - # TODO rename to `default_config.toml` - app.config.from_pyfile("flask.cfg") + app.config.from_file("default_config.toml", load=tomllib.load, text=False) + app.config.from_prefixed_env() engine = create_engine(get_connection_string()) with engine.connect() as connection: diff --git a/web/flask.cfg b/web/default_config.toml similarity index 100% rename from web/flask.cfg rename to web/default_config.toml