diff options
Diffstat (limited to '')
| -rw-r--r-- | webmentions_ssg/__init__.py | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/webmentions_ssg/__init__.py b/webmentions_ssg/__init__.py index 223f35d..8e87485 100644 --- a/webmentions_ssg/__init__.py +++ b/webmentions_ssg/__init__.py @@ -13,14 +13,19 @@ import coloredlogs from flask import Flask from werkzeug.middleware.proxy_fix import ProxyFix -from .auth import AUTH +from .auth import login_manager from .cli import DB_CLI, MAIL_CLI, USERS_CLI -from .config import DefaultConfig, DevelopmentConfig, ProductionConfig, validate_config +from .config import ( + DefaultConfig, + DevelopmentConfig, + ProductionConfig, + validated_config_overrides, +) from .extensions import bootstrap, csrf, db, huey, limiter, mail, migrate from .net import is_http_url from .version import APP_NAME as APP_NAME from .version import VERSION -from .views import root_page +from .views import webmentions_bp def create_app(config_class: type[DefaultConfig] | None = None) -> Flask: @@ -61,7 +66,7 @@ def create_app(config_class: type[DefaultConfig] | None = None) -> Flask: app.config.from_prefixed_env(prefix="FLASK") app.config.from_prefixed_env(prefix="WEBMENTIONS_SSG") - app.config.update(validate_config(app.config, config_class=config_class)) + app.config.update(validated_config_overrides(app.config, config_class=config_class)) if proxy_hops := app.config["PROXY_FIX_TRUSTED_HOPS"]: # Do not trust forwarded host, port, or URL prefixes. @@ -75,8 +80,8 @@ def create_app(config_class: type[DefaultConfig] | None = None) -> Flask: log_file_handler = logging.handlers.RotatingFileHandler( app.config["LOG_FILE"], - maxBytes=app.config["LOGFILE_MAX_BYTES"], - backupCount=app.config["LOGFILE_BACKUP_COUNT"], + maxBytes=app.config["LOG_FILE_MAX_BYTES"], + backupCount=app.config["LOG_FILE_BACKUP_COUNT"], ) log_file_handler.setLevel(app.config["LOG_LEVEL"]) log_file_handler.setFormatter(default_logging_formatter) @@ -111,7 +116,7 @@ def create_app(config_class: type[DefaultConfig] | None = None) -> Flask: limiter.init_app(app) mail.init_app(app) - AUTH.init_app(app) + login_manager.init_app(app) bootstrap.init_app(app) huey.init_app(app) @@ -125,7 +130,7 @@ def create_app(config_class: type[DefaultConfig] | None = None) -> Flask: app.add_template_filter(is_http_url) - app.register_blueprint(root_page) + app.register_blueprint(webmentions_bp) app.cli.add_command(USERS_CLI) |
