Page MenuHomeSoftware Heritage
Files F7124347

D5393.diff
No OneTemporary
Actions

D5393.diff
View Options

diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -2001,6 +2001,10 @@
swh::deploy::webapp::backend::http_timeout: 3600
swh::deploy::webapp::backend::reload_mercy: 3600
+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::password in private data
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]
@@ -2981,6 +2985,12 @@
user: "%{hiera('swh::deploy::indexer::storage::db::user')}"
port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
password: "%{hiera('swh::deploy::indexer::storage::db::password')}"
+ - alias: admin-swh-web
+ name: "%{hiera('swh::deploy::webapp::db::name')}"
+ host: "%{hiera('swh::deploy::webapp::db::host')}"
+ user: "%{hiera('swh::deploy::webapp::db::user')}"
+ port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+ password: "%{hiera('swh::deploy::webapp::db::password')}"
- alias: swh
name: "%{hiera('swh::deploy::storage::db::dbname')}"
host: "%{hiera('swh::deploy::storage::db::host')}"
@@ -3023,6 +3033,12 @@
user: "%{hiera('swh::deploy::indexer::storage::db::user')}"
port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
user: guest
+ - alias: swh-web
+ name: "%{hiera('swh::deploy::webapp::db::name')}"
+ host: "%{hiera('swh::deploy::webapp::db::host')}"
+ user: "%{hiera('swh::deploy::webapp::db::user')}"
+ port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+ user: guest
elastic::elk_version: '7.8.0'
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
@@ -27,6 +27,9 @@
swh::deploy::worker::lister::db::user: swh-lister
swh::deploy::worker::lister::db::name: swh-lister
+swh::deploy::webapp::db::host: db1.internal.staging.swh.network
+# swh::deploy::webapp::db::password in private data
+
swh::deploy::worker::instances:
- checker_deposit
- loader_archive
@@ -203,6 +206,9 @@
name: clearly-defined-full
user: clearly-defined
password: "%{lookup('swh::deploy::clearly_defined::db::password')}"
+ webapp:
+ name: swh-web
+ user: swh-web
pgbouncer::auth_hba_file: "/etc/postgresql/%{lookup('swh::postgresql::cluster_name')}/pg_hba.conf"
pgbouncer::common::listen_addresses:
@@ -248,6 +254,11 @@
auth_user: postgres
port: 5433
alias: staging-clearly-defined-full
+ - source_db: swh-web
+ host: localhost
+ auth_user: postgres
+ port: 5433
+ alias: staging-swh-web
# open objstorage api
swh::deploy::objstorage::backend::listen::host: 0.0.0.0

File Metadata

Mime Type
text/plain
Expires
Dec 21 2024, 8:09 AM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3222034

Event Timeline

About · Developer information · Legal