From e177fe0037e66100fdadc83447b67d3ee37ab3a2 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Fri, 26 Oct 2018 10:11:03 -0400 Subject: [PATCH] Add REQUIRE_CRLS to config parser --- atst/app.py | 4 ++-- config/base.ini | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/atst/app.py b/atst/app.py index 273d3a86..cad01fea 100644 --- a/atst/app.py +++ b/atst/app.py @@ -28,7 +28,6 @@ from atst.queue import queue ENV = os.getenv("FLASK_ENV", "dev") -REQUIRE_CRLS = os.getenv("REQUIRE_CRLS", "True") def make_app(config): @@ -47,7 +46,7 @@ def make_app(config): app.config.update({"SESSION_REDIS": app.redis}) make_flask_callbacks(app) - if REQUIRE_CRLS == "True": + if app.config.get("REQUIRE_CRLS"): make_crl_validator(app) register_filters(app) make_eda_client(app) @@ -101,6 +100,7 @@ def map_config(config): "PERMANENT_SESSION_LIFETIME": config.getint( "default", "PERMANENT_SESSION_LIFETIME" ), + "REQUIRE_CRLS": config.getboolean("default", "REQUIRE_CRLS"), "RQ_REDIS_URL": config["default"]["REDIS_URI"], "RQ_QUEUES": ["atat_{}".format(ENV.lower())], } diff --git a/config/base.ini b/config/base.ini index 5fa7ec6e..491ab0e4 100644 --- a/config/base.ini +++ b/config/base.ini @@ -15,6 +15,7 @@ PGPORT = 5432 PGUSER = postgres PORT=8000 REDIS_URI = redis://localhost:6379 +REQUIRE_CRLS = true SECRET = change_me_into_something_secret SECRET_KEY = change_me_into_something_secret SESSION_COOKIE_NAME=atat