pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crl storage config name

Browse Source
This commit is contained in:
dandds 2019-03-01 15:10:56 -05:00
parent 7fbb8d05e0
commit 44d52ae601
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/app.py
View File

@ -200,7 +200,7 @@ def make_crl_validator(app):
app.crl_cache = NoOpCRLCache(logger=app.logger) app.crl_cache = NoOpCRLCache(logger=app.logger)
else: else:
crl_locations = [] 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()) crl_locations.append(filename.absolute())
app.crl_cache = CRLCache( app.crl_cache = CRLCache(
app.config["CA_CHAIN"], app.config["CA_CHAIN"],

2
config/ci.ini
View File

@ -3,5 +3,5 @@ DEBUG = false
PGHOST = postgreshost PGHOST = postgreshost
PGDATABASE = atat_test PGDATABASE = atat_test
REDIS_URI = redis://redishost:6379 REDIS_URI = redis://redishost:6379
CRL_CONTAINER = tests/fixtures/crl CRL_STORAGE_CONTAINER = tests/fixtures/crl
WTF_CSRF_ENABLED = false WTF_CSRF_ENABLED = false

2
config/selenium.ini
View File

@ -1,3 +1,3 @@
[default] [default]
PGDATABASE = atat_selenium PGDATABASE = atat_selenium
CRL_CONTAINER = tests/fixtures/crl CRL_STORAGE_CONTAINER = tests/fixtures/crl

2
config/test.ini
View File

@ -2,6 +2,6 @@
DEBUG = false DEBUG = false
ENVIRONMENT = test ENVIRONMENT = test
PGDATABASE = atat_test PGDATABASE = atat_test
CRL_CONTAINER = tests/fixtures/crl CRL_STORAGE_CONTAINER = tests/fixtures/crl
WTF_CSRF_ENABLED = false WTF_CSRF_ENABLED = false
STORAGE_PROVIDER=LOCAL STORAGE_PROVIDER=LOCAL

2
script/seed_roles.py
View File

@ -31,7 +31,7 @@ def seed_roles():
if __name__ == "__main__": 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) app = make_app(config)
with app.app_context(): with app.app_context():
seed_roles() seed_roles()

4
tests/conftest.py
View File

@ -22,7 +22,9 @@ def app(request):
upload_dir = TemporaryDirectory() upload_dir = TemporaryDirectory()
config = make_config() 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) _app = make_app(config)