diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -2840,6 +2840,8 @@ swh::deploy::indexer_journal_client::content_mimetype::loglevel: INFO swh::deploy::indexer_journal_client::content_mimetype::journal_authentication: true +swh::deploy::journal_client::brokers: "%{alias('swh::deploy::journal::brokers')}" + # Contains a password: in private data swh::deploy::indexer_journal_client::content_mimetype::config: # FIXME: Required by BaseIndexer class code, unused in this context though @@ -2847,7 +2849,7 @@ indexer_storage: "%{alias('swh::remote_service::indexer::config::writable')}" objstorage: "%{alias('swh::remote_service::objstorage::config')}" journal: - brokers: "%{alias('swh::deploy::journal::brokers')}" + brokers: "%{alias('swh::deploy::journal_client::brokers')}" group_id: swh.indexer.journal_client.content_mimetype prefix: "%{alias('swh::deploy::journal::prefix')}" tools: @@ -2868,7 +2870,7 @@ indexer_storage: "%{alias('swh::remote_service::indexer::config::writable')}" objstorage: "%{alias('swh::remote_service::objstorage::config')}" journal: - brokers: "%{alias('swh::deploy::journal::brokers')}" + brokers: "%{alias('swh::deploy::journal_client::brokers')}" group_id: swh.indexer.journal_client.content_fossology_license prefix: "%{alias('swh::deploy::journal::prefix')}" workdir: /tmp/swh/indexer.fossology.license/ @@ -2908,7 +2910,7 @@ objstorage: "%{alias('swh::remote_service::objstorage::config')}" storage: "%{alias('swh::remote_service::storage::config')}" journal: - brokers: "%{alias('swh::deploy::journal::brokers')}" + brokers: "%{alias('swh::deploy::journal_client::brokers')}" group_id: swh.indexer.journal_client.origin_intrinsic_metadata prefix: "%{alias('swh::deploy::journal::prefix')}" batch_size: "%{alias('swh::deploy::indexer_journal_client::origin_intrinsic_metadata::batch_size')}" diff --git a/data/deployments/production/common.yaml b/data/deployments/production/common.yaml --- a/data/deployments/production/common.yaml +++ b/data/deployments/production/common.yaml @@ -26,3 +26,10 @@ memcached::server::max_memory: 1224 cassandra::default_cluster_name: archive_production + +# In production, we pass through the public brokers +swh::deploy::journal_client::brokers: + - broker1.journal.softwareheritage.org:9093 + - broker2.journal.softwareheritage.org:9093 + - broker3.journal.softwareheritage.org:9093 + - broker4.journal.softwareheritage.org:9093