remove REQUIRE_CRLS setting in favor of DISABLE_CRL_CHECK

This commit is contained in:
dandds 2019-01-18 09:48:43 -05:00
parent 80f633f457
commit 4bd41950c6
5 changed files with 4 additions and 9 deletions

View File

@ -48,10 +48,7 @@ def make_app(config):
app.config.update({"SESSION_REDIS": app.redis})
make_flask_callbacks(app)
# TODO: deprecate the REQUIRE_CRLs setting in favor of the
# DISABLE_CRL_CHECK; both have the effect of never loading CRLs
if app.config.get("REQUIRE_CRLS"):
make_crl_validator(app)
make_crl_validator(app)
register_filters(app)
make_eda_client(app)
make_csp_provider(app)
@ -132,7 +129,6 @@ 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": [config["default"]["RQ_QUEUES"]],
"DISABLE_CRL_CHECK": config.getboolean("default", "DISABLE_CRL_CHECK"),

View File

@ -17,7 +17,6 @@ PGPORT = 5432
PGUSER = postgres
PORT=8000
REDIS_URI = redis://localhost:6379
REQUIRE_CRLS = true
RQ_QUEUES = atat_%(ENVIRONMENT)s
SECRET = change_me_into_something_secret
SECRET_KEY = change_me_into_something_secret

View File

@ -5,4 +5,4 @@ metadata:
name: atst-worker-envvars
namespace: atat
data:
REQUIRE_CRLS: "False"
DISABLE_CRL_CHECK: "True"

View File

@ -5,4 +5,4 @@ metadata:
name: atst-worker-envvars
namespace: atat-test
data:
REQUIRE_CRLS: "False"
DISABLE_CRL_CHECK: "True"

View File

@ -5,4 +5,4 @@ metadata:
name: atst-worker-envvars
namespace: atat-uat
data:
REQUIRE_CRLS: "False"
DISABLE_CRL_CHECK: "True"