diff --git a/data/hostname/db0.internal.staging.swh.network.yaml b/data/hostname/db0.internal.staging.swh.network.yaml index b4ab41ec..e411d0ef 100644 --- a/data/hostname/db0.internal.staging.swh.network.yaml +++ b/data/hostname/db0.internal.staging.swh.network.yaml @@ -1,21 +1,41 @@ --- networks: default: interface: eth0 address: 192.168.128.3 netmask: 255.255.255.0 gateway: 192.168.128.1 swh::dbs: storage: name: swh user: swh indexer: name: swh-indexer user: swh-indexer scheduler: name: swh-scheduler user: swh-scheduler +pgbouncer::auth_hba_file: /etc/postgresql/11/replica/pg_hba.conf +pgbouncer::listen_addr: 192.168.128.3 +pgbouncer::databases: + # swh + - source_db: swh + host: db0.internal.staging.swh.network + auth_user: swh + port: 5433 + alias: staging-swh + - source_db: swh-indexer + host: db0.internal.staging.swh.network + auth_user: swh-indexer + port: 5433 + alias: staging-swh-indexer + - source_db: swh-scheduler + host: db0.internal.staging.swh.network + auth_user: swh-scheduler + port: 5433 + alias: staging-swh-scheduler + dar::backup::exclude: - srv/softwareheritage/postgres diff --git a/manifests/site.pp b/manifests/site.pp index 9951c25c..43bcca77 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,129 +1,130 @@ node 'louvre.internal.softwareheritage.org' { include role::swh_server } node /^(orsay|beaubourg|hypervisor\d+)\.(internal\.)?softwareheritage\.org$/ { include role::swh_hypervisor } node 'pergamon.softwareheritage.org' { include role::swh_sysadmin include profile::export_archive_counters } node 'tate.softwareheritage.org' { include role::swh_forge } node 'moma.softwareheritage.org' { include role::swh_api } node 'webapp0.softwareheritage.org' { include role::swh_base_api } node 'saatchi.internal.softwareheritage.org' { include role::swh_scheduler } node /^(belvedere|somerset).(internal.)?softwareheritage.org$/ { include role::swh_database include profile::pgbouncer } node 'banco.softwareheritage.org' { include role::swh_backup include role::postgresql_backup } node /^esnode\d+.(internal.)?softwareheritage.org$/ { include role::swh_elasticsearch } node /^(unibo-test).(internal.)?softwareheritage.org$/ { include role::swh_vault_test } node /^(unibo-prod|vangogh).(euwest.azure.)?(internal.)?softwareheritage.org$/ { include role::swh_vault } node /^uffizi\.(internal\.)?softwareheritage\.org$/ { include role::swh_storage_baremetal } node /^storage\d+\.[^.]+\.azure\.internal\.softwareheritage\.org$/ { include role::swh_storage } node /^getty.(internal.)?softwareheritage.org$/ { include role::swh_eventlog } node /^worker\d+\.(internal\.)?softwareheritage\.org$/ { include role::swh_worker_inria } node /^worker\d+\..*\.azure\.internal\.softwareheritage\.org$/ { include role::swh_worker_azure } node /^dbreplica(0|1)\.euwest\.azure\.internal\.softwareheritage\.org$/ { include role::swh_database } node /^ceph-osd\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_osd } node /^ceph-mon\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_mon } node /^ns\d+\.(.*\.azure\.)?internal\.softwareheritage\.org/ { include role::swh_nameserver_secondary } node 'thyssen.internal.softwareheritage.org' { include role::swh_ci_server } node /^jenkins-debian\d+\.internal\.softwareheritage\.org$/ { include role::swh_ci_agent_debian } node 'logstash0.internal.softwareheritage.org' { include role::swh_logstash_instance } node 'kibana0.internal.softwareheritage.org' { include role::swh_kibana_instance } node 'munin0.internal.softwareheritage.org' { include role::swh_munin_master } node 'giverny.softwareheritage.org' { include role::swh_desktop } node /^db0.internal.staging.swh.network$/ { include role::swh_base_database include profile::postgresql::server + include profile::pgbouncer } node 'gateway.internal.staging.swh.network' { include role::swh_gateway } node /^storage0\.internal\.staging\.swh\.network$/ { include role::swh_base_storage } node default { include role::swh_base include profile::puppet::agent }