diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -1876,6 +1876,11 @@ swh::deploy::journal::prefix: swh.journal.objects +swh::deploy::scrubber::db::user: swh-scrubber +swh::deploy::scrubber::db::dbname: swh-scrubber +swh::deploy::scrubber::db::host: db.internal.softwareheritage.org +swh::deploy::scrubber::db::port: "%{alias('swh::deploy::db::pgbouncer::port')}" + swh::deploy::scrubber::sentry_swh_package: swh.scrubber swh::deploy::scrubber::sentry_environment: "%{alias('swh::deploy::environment')}" swh::deploy::scrubber::sentry_dsn: "https://%{lookup('swh::deploy::scrubber::sentry_token')}@sentry.softwareheritage.org/23" diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml --- a/data/deployments/staging/common.yaml +++ b/data/deployments/staging/common.yaml @@ -28,8 +28,6 @@ swh::deploy::worker::lister::db::name: swh-lister swh::deploy::scrubber::db::host: db1.internal.staging.swh.network -swh::deploy::scrubber::db::user: swh-scrubber -swh::deploy::scrubber::db::dbname: swh-scrubber swh::deploy::webapp::db::host: db1.internal.staging.swh.network # swh::deploy::webapp::db::password in private data diff --git a/data/hostname/belvedere.internal.softwareheritage.org.yaml b/data/hostname/belvedere.internal.softwareheritage.org.yaml --- a/data/hostname/belvedere.internal.softwareheritage.org.yaml +++ b/data/hostname/belvedere.internal.softwareheritage.org.yaml @@ -40,6 +40,11 @@ host: belvedere.internal.softwareheritage.org auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}" port: "%{hiera('swh::deploy::webapp::db::port')}" + # swh-scrubber + - source_db: "%{hiera('swh::deploy::scrubber::db::dbname')}" + host: "%{hiera('swh::deploy::scrubber::db::host')}" + auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}" + port: "%{hiera('swh::deploy::db::secondary::port')}" # catch-all - source_db: "*" host: 127.0.0.1