diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,6 +1,6 @@ swh.core >= 0.0.40 swh.model >= 0.0.25 swh.storage >= 0.0.124 -swh.vault >= 0.0.20 +swh.vault >= 0.0.23 swh.indexer >= 0.0.120 -swh.scheduler >= 0.0.31 \ No newline at end of file +swh.scheduler >= 0.0.31 diff --git a/swh/web/config.py b/swh/web/config.py --- a/swh/web/config.py +++ b/swh/web/config.py @@ -6,7 +6,7 @@ from swh.core import config from swh.storage import get_storage from swh.indexer.storage import get_indexer_storage -from swh.vault.api.client import RemoteVaultClient +from swh.vault import get_vault from swh.scheduler import get_scheduler @@ -26,7 +26,6 @@ 'timeout': 1, } }), - 'vault': ('string', 'http://127.0.0.1:5005/'), 'log_dir': ('string', '/tmp/swh/log'), 'debug': ('bool', False), 'serve_assets': ('bool', False), @@ -62,10 +61,16 @@ } } }), + 'vault': ('dict', { + 'cls': 'remote', + 'args': { + 'url': 'http://127.0.0.1:5005/', + } + }), 'scheduler': ('dict', { 'cls': 'remote', 'args': { - 'url': 'http://localhost:5008/' + 'url': 'http://127.0.0.1:5008/' } }), 'grecaptcha': ('dict', { @@ -97,7 +102,7 @@ swhweb_config.update(cfg) config.prepare_folders(swhweb_config, 'log_dir') swhweb_config['storage'] = get_storage(**swhweb_config['storage']) - swhweb_config['vault'] = RemoteVaultClient(swhweb_config['vault']) + swhweb_config['vault'] = get_vault(**swhweb_config['vault']) swhweb_config['indexer_storage'] = \ get_indexer_storage(**swhweb_config['indexer_storage']) swhweb_config['scheduler'] = get_scheduler(**swhweb_config['scheduler']) # noqa