diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -2004,7 +2004,15 @@ swh::deploy::webapp::db::host: db.internal.softwareheritage.org swh::deploy::webapp::db::user: swh-web swh::deploy::webapp::db::name: swh-web +swh::deploy::webapp::db::port: 5433 # swh::deploy::webapp::db::password in private data +swh::deploy::webapp::production_db: + host: "%{alias('swh::deploy::webapp::db::host')}" + port: "%{alias('swh::deploy::db::pgbouncer::port')}" + name: "%{alias('swh::deploy::webapp::db::name')}" + user: "%{alias('swh::deploy::webapp::db::user')}" + password: "%{alias('swh::deploy::webapp::db::password')}" + swh::deploy::webapp::reverse_proxy::backend_http_port: "%{alias('varnish::backend_http_port')}" # aliases are pulled from letsencrypt::certificates[$swh::deploy::webapp::vhost::letsencrypt_cert] @@ -2016,8 +2024,6 @@ swh::deploy::webapp::vhost::access_log_format: combined_with_duration swh::deploy::webapp::config::es_workers_index_url: http://esnode1.internal.softwareheritage.org:9200/swh_workers-* -swh::deploy::webapp::production_db_dir: /var/lib/swh -swh::deploy::webapp::production_db: "%{hiera('swh::deploy::webapp::production_db_dir')}/web.sqlite3" swh::deploy::webapp::deposit::private::url: "%{hiera('swh::deploy::deposit::internal_url')}/1/private/" swh::deploy::webapp::config::throttling: cache_uri: "%{hiera('memcached::server::bind')}:%{hiera('memcached::server::port')}" 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 @@ -327,10 +327,3 @@ swh::deploy::vault::e2e::webapp: "https://webapp.staging.swh.network" swh::config::keycloak::realm_name: SoftwareHeritageStaging - -swh::deploy::webapp::production_db: - host: "%{alias('swh::deploy::webapp::db::host')}" - port: "%{alias('swh::deploy::db::pgbouncer::port')}" - name: "%{alias('swh::deploy::webapp::db::name')}" - user: "%{alias('swh::deploy::webapp::db::user')}" - password: "%{alias('swh::deploy::webapp::db::password')}" 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 @@ -35,6 +35,11 @@ host: belvedere.internal.softwareheritage.org auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}" port: "%{hiera('swh::deploy::db::indexer::port')}" + # swh-web + - source_db: "%{hiera('swh::deploy::webapp::db::name')}" + host: belvedere.internal.softwareheritage.org + auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}" + port: "%{hiera('swh::deploy::db::webapp::port')}" # catch-all - source_db: "*" host: 127.0.0.1