Use toml and env vars for config

agdsn · May 20, 2024 · f8a581f · f8a581f
1 parent f51c436
commit f8a581f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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 → web/default_config.toml b/web/flask.cfg → web/default_config.toml