diff --git a/docker/conf/deposit.yml b/docker/conf/deposit.yml --- a/docker/conf/deposit.yml +++ b/docker/conf/deposit.yml @@ -1,17 +1,14 @@ scheduler: cls: remote - args: - url: http://swh-scheduler:5008 + url: http://swh-scheduler:5008 storage: cls: remote - args: - url: http://swh-storage:5002/ + url: http://swh-storage:5002/ storage_metadata: cls: remote - args: - url: http://swh-storage:5002/ + url: http://swh-storage:5002/ allowed_hosts: - '*' diff --git a/docker/conf/indexer.yml b/docker/conf/indexer.yml --- a/docker/conf/indexer.yml +++ b/docker/conf/indexer.yml @@ -1,18 +1,15 @@ storage: cls: remote - args: - url: http://swh-storage:5002/ + url: http://swh-storage:5002/ objstorage: cls: remote - args: - url: http://swh-objstorage:5003/ + url: http://swh-objstorage:5003/ indexer_storage: cls: remote url: http://swh-idx-storage:5007/ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ celery: task_broker: amqp://guest:guest@amqp// task_modules: diff --git a/docker/conf/indexer_journal_client.yml b/docker/conf/indexer_journal_client.yml --- a/docker/conf/indexer_journal_client.yml +++ b/docker/conf/indexer_journal_client.yml @@ -7,5 +7,4 @@ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ diff --git a/docker/conf/lister.yml b/docker/conf/lister.yml --- a/docker/conf/lister.yml +++ b/docker/conf/lister.yml @@ -1,12 +1,10 @@ storage: cls: remote - args: - url: http://swh-storage:5002/ + url: http://swh-storage:5002/ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ lister: cls: local diff --git a/docker/conf/loader.yml b/docker/conf/loader.yml --- a/docker/conf/loader.yml +++ b/docker/conf/loader.yml @@ -14,8 +14,7 @@ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ deposit: url: http://swh-deposit:5006/1/private diff --git a/docker/conf/objstorage.yml b/docker/conf/objstorage.yml --- a/docker/conf/objstorage.yml +++ b/docker/conf/objstorage.yml @@ -1,7 +1,6 @@ objstorage: cls: pathslicing - args: - root: /srv/softwareheritage/objects - slicing: 0:5 + root: /srv/softwareheritage/objects + slicing: 0:5 client_max_size: 1073741824 diff --git a/docker/conf/scheduler.yml b/docker/conf/scheduler.yml --- a/docker/conf/scheduler.yml +++ b/docker/conf/scheduler.yml @@ -1,7 +1,6 @@ scheduler: cls: local - args: - db: postgresql:///?service=swh-scheduler + db: postgresql:///?service=swh-scheduler celery: task_broker: amqp://guest:guest@amqp/%2f broker_transport_options: diff --git a/docker/conf/search.yml b/docker/conf/search.yml --- a/docker/conf/search.yml +++ b/docker/conf/search.yml @@ -1,5 +1,4 @@ search: cls: elasticsearch - args: - hosts: - - elasticsearch:9200 + hosts: + - elasticsearch:9200 diff --git a/docker/conf/search_journal_client_objects.yml b/docker/conf/search_journal_client_objects.yml --- a/docker/conf/search_journal_client_objects.yml +++ b/docker/conf/search_journal_client_objects.yml @@ -1,7 +1,6 @@ search: cls: remote - args: - url: http://swh-search:5010/ + url: http://swh-search:5010/ journal: brokers: - kafka diff --git a/docker/conf/storage-mirror.yml b/docker/conf/storage-mirror.yml --- a/docker/conf/storage-mirror.yml +++ b/docker/conf/storage-mirror.yml @@ -1,8 +1,6 @@ storage: cls: local - args: - db: postgresql:///?service=swh-storage-mirror - objstorage: - cls: remote - args: - url: http://swh-objstorage:5003/ + db: postgresql:///?service=swh-storage-mirror + objstorage: + cls: remote + url: http://swh-objstorage:5003/ diff --git a/docker/conf/storage-read-replica.yml b/docker/conf/storage-read-replica.yml --- a/docker/conf/storage-read-replica.yml +++ b/docker/conf/storage-read-replica.yml @@ -1,13 +1,10 @@ storage: cls: local - args: - db: postgresql:///?service=swh-storage-read-replica - objstorage: - cls: filtered - args: - storage_conf: - cls: remote - args: - url: http://swh-objstorage:5003/ - filters_conf: - - type: readonly + db: postgresql:///?service=swh-storage-read-replica + objstorage: + cls: filtered + storage_conf: + cls: remote + url: http://swh-objstorage:5003/ + filters_conf: + - type: readonly diff --git a/docker/conf/storage.yml b/docker/conf/storage.yml --- a/docker/conf/storage.yml +++ b/docker/conf/storage.yml @@ -1,15 +1,13 @@ storage: cls: local - args: - db: postgresql:///?service=swh-storage - objstorage: - cls: remote - args: - url: http://swh-objstorage:5003/ - journal_writer: - cls: kafka - args: - brokers: - - kafka - prefix: swh.journal.objects - client_id: swh.storage.master + db: postgresql:///?service=swh-storage + objstorage: + cls: remote + url: http://swh-objstorage:5003/ + journal_writer: + cls: kafka + args: + brokers: + - kafka + prefix: swh.journal.objects + client_id: swh.storage.master diff --git a/docker/conf/storage_cassandra.yml b/docker/conf/storage_cassandra.yml --- a/docker/conf/storage_cassandra.yml +++ b/docker/conf/storage_cassandra.yml @@ -1,11 +1,9 @@ storage: cls: cassandra - args: - hosts: + hosts: - cassandra-seed - keyspace: swh - objstorage: - cls: remote - args: - url: http://swh-objstorage:5003/ + keyspace: swh + objstorage: + cls: remote + url: http://swh-objstorage:5003/ diff --git a/docker/conf/vault-read-replica.yml b/docker/conf/vault-read-replica.yml --- a/docker/conf/vault-read-replica.yml +++ b/docker/conf/vault-read-replica.yml @@ -1,17 +1,14 @@ storage: cls: remote - args: - url: http://swh-storage-read-replica:5002/ + url: http://swh-storage-read-replica:5002/ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ vault: cls: local args: db: postgresql:///?service=swh-vault cache: cls: pathslicing - args: - root: /srv/softwareheritage/vault - slicing: 0:5 + root: /srv/softwareheritage/vault + slicing: 0:5 diff --git a/docker/conf/vault-worker-read-replica.yml b/docker/conf/vault-worker-read-replica.yml --- a/docker/conf/vault-worker-read-replica.yml +++ b/docker/conf/vault-worker-read-replica.yml @@ -1,11 +1,9 @@ storage: cls: remote - args: - url: http://swh-storage-read-replica:5002/ + url: http://swh-storage-read-replica:5002/ vault: cls: remote - args: - url: http://swh-vault:5005/ + url: http://swh-vault:5005/ celery: task_broker: amqp://guest:guest@amqp// task_modules: diff --git a/docker/conf/vault-worker.yml b/docker/conf/vault-worker.yml --- a/docker/conf/vault-worker.yml +++ b/docker/conf/vault-worker.yml @@ -1,7 +1,6 @@ storage: cls: remote - args: - url: http://swh-storage:5002/ + url: http://swh-storage:5002/ vault: cls: remote args: diff --git a/docker/conf/vault.yml b/docker/conf/vault.yml --- a/docker/conf/vault.yml +++ b/docker/conf/vault.yml @@ -1,17 +1,14 @@ storage: cls: remote - args: - url: http://swh-storage:5002/ + url: http://swh-storage:5002/ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ vault: cls: local args: db: postgresql:///?service=swh-vault cache: cls: pathslicing - args: - root: /srv/softwareheritage/vault - slicing: 0:5 + root: /srv/softwareheritage/vault + slicing: 0:5 diff --git a/docker/conf/web-keycloak.yml b/docker/conf/web-keycloak.yml --- a/docker/conf/web-keycloak.yml +++ b/docker/conf/web-keycloak.yml @@ -1,23 +1,19 @@ storage: cls: remote - args: - url: http://swh-storage:5002/ - timeout: 1 + url: http://swh-storage:5002/ + timeout: 1 objstorage: cls: remote - args: - url: http://swh-objstorage:5003/ + url: http://swh-objstorage:5003/ indexer_storage: cls: remote - args: - url: http://swh-idx-storage:5007/ + url: http://swh-idx-storage:5007/ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ vault: cls: remote diff --git a/docker/conf/web-mirror.yml b/docker/conf/web-mirror.yml --- a/docker/conf/web-mirror.yml +++ b/docker/conf/web-mirror.yml @@ -1,23 +1,19 @@ storage: cls: remote - args: - url: http://swh-storage-mirror:5002/ - timeout: 1 + url: http://swh-storage-mirror:5002/ + timeout: 1 objstorage: cls: remote - args: - url: http://swh-objstorage:5003/ + url: http://swh-objstorage:5003/ indexer_storage: cls: remote - args: - url: http://swh-idx-storage:5007/ + url: http://swh-idx-storage:5007/ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ vault: cls: remote diff --git a/docker/conf/web-read-replica.yml b/docker/conf/web-read-replica.yml --- a/docker/conf/web-read-replica.yml +++ b/docker/conf/web-read-replica.yml @@ -1,18 +1,15 @@ storage: cls: remote - args: - url: http://swh-storage-read-replica:5002/ - timeout: 1 + url: http://swh-storage-read-replica:5002/ + timeout: 1 indexer_storage: cls: remote - args: - url: http://swh-idx-storage:5007/ + url: http://swh-idx-storage:5007/ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ vault: cls: remote diff --git a/docker/conf/web.yml b/docker/conf/web.yml --- a/docker/conf/web.yml +++ b/docker/conf/web.yml @@ -1,18 +1,15 @@ storage: cls: remote - args: - url: http://swh-storage:5002/ - timeout: 1 + url: http://swh-storage:5002/ + timeout: 1 indexer_storage: cls: remote - args: - url: http://swh-idx-storage:5007/ + url: http://swh-idx-storage:5007/ scheduler: cls: remote - args: - url: http://swh-scheduler:5008/ + url: http://swh-scheduler:5008/ vault: cls: remote