diff --git a/atst/app.py b/atst/app.py index d3cb357a..fcca8f44 100644 --- a/atst/app.py +++ b/atst/app.py @@ -200,7 +200,7 @@ def make_crl_validator(app): app.crl_cache = NoOpCRLCache(logger=app.logger) else: crl_locations = [] - for filename in pathlib.Path(app.config["CRL_CONTAINER"]).glob("*.crl"): + for filename in pathlib.Path(app.config["CRL_STORAGE_CONTAINER"]).glob("*.crl"): crl_locations.append(filename.absolute()) app.crl_cache = CRLCache( app.config["CA_CHAIN"], diff --git a/config/ci.ini b/config/ci.ini index f472488d..d03168de 100644 --- a/config/ci.ini +++ b/config/ci.ini @@ -3,5 +3,5 @@ DEBUG = false PGHOST = postgreshost PGDATABASE = atat_test REDIS_URI = redis://redishost:6379 -CRL_CONTAINER = tests/fixtures/crl +CRL_STORAGE_CONTAINER = tests/fixtures/crl WTF_CSRF_ENABLED = false diff --git a/config/selenium.ini b/config/selenium.ini index 47f730ef..3bc414d5 100644 --- a/config/selenium.ini +++ b/config/selenium.ini @@ -1,3 +1,3 @@ [default] PGDATABASE = atat_selenium -CRL_CONTAINER = tests/fixtures/crl +CRL_STORAGE_CONTAINER = tests/fixtures/crl diff --git a/config/test.ini b/config/test.ini index 3a3b0b1b..c39d4de4 100644 --- a/config/test.ini +++ b/config/test.ini @@ -2,6 +2,6 @@ DEBUG = false ENVIRONMENT = test PGDATABASE = atat_test -CRL_CONTAINER = tests/fixtures/crl +CRL_STORAGE_CONTAINER = tests/fixtures/crl WTF_CSRF_ENABLED = false STORAGE_PROVIDER=LOCAL diff --git a/script/seed_roles.py b/script/seed_roles.py index 6982e179..00b96920 100755 --- a/script/seed_roles.py +++ b/script/seed_roles.py @@ -31,7 +31,7 @@ def seed_roles(): if __name__ == "__main__": - config = make_config({"DISABLE_CRL_CHECK": True}) + config = make_config({"DISABLE_CRL_CHECK": True, "CRL_STORAGE_PROVIDER": "LOCAL"}) app = make_app(config) with app.app_context(): seed_roles() diff --git a/tests/conftest.py b/tests/conftest.py index def8bf93..4bc5dda8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -22,7 +22,9 @@ def app(request): upload_dir = TemporaryDirectory() config = make_config() - config.update({"STORAGE_CONTAINER": upload_dir.name}) + config.update( + {"STORAGE_CONTAINER": upload_dir.name, "CRL_STORAGE_PROVIDER": "LOCAL"} + ) _app = make_app(config)