Page Menu
Home
Software Heritage
Search
Configure Global Search
Log In
Files
F9347984
D4372.id15545.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Subscribers
None
D4372.id15545.diff
View Options
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
@@ -3,27 +3,27 @@
swh::deploy::worker::loader_nixguix::loglevel: debug
-swh::deploy::storage::db::host: db0.internal.staging.swh.network
+swh::deploy::storage::db::host: db1.internal.staging.swh.network
swh::deploy::storage::db::user: swh
swh::deploy::storage::db::dbname: swh
-swh::deploy::indexer::storage::db::host: db0.internal.staging.swh.network
+swh::deploy::indexer::storage::db::host: db1.internal.staging.swh.network
swh::deploy::indexer::storage::db::user: swh-indexer
swh::deploy::indexer::storage::db::dbname: swh-indexer
-swh::deploy::scheduler::db::host: db0.internal.staging.swh.network
+swh::deploy::scheduler::db::host: db1.internal.staging.swh.network
swh::deploy::scheduler::db::dbname: swh-scheduler
swh::deploy::scheduler::db::user: swh-scheduler
-swh::deploy::deposit::db::host: deposit.internal.staging.swh.network
+swh::deploy::deposit::db::host: db1.internal.staging.swh.network
swh::deploy::deposit::db::dbuser: swh-deposit
swh::deploy::deposit::db::dbname: swh-deposit
-swh::deploy::vault::db::host: db0.internal.staging.swh.network
+swh::deploy::vault::db::host: db1.internal.staging.swh.network
swh::deploy::vault::db::user: swh-vault
swh::deploy::vault::db::dbname: swh-vault
-swh::deploy::worker::lister::db::host: db0.internal.staging.swh.network
+swh::deploy::worker::lister::db::host: db1.internal.staging.swh.network
swh::deploy::worker::lister::db::user: swh-lister
swh::deploy::worker::lister::db::name: swh-lister
diff --git a/data/hostname/deposit.internal.staging.swh.network.yaml b/data/hostname/deposit.internal.staging.swh.network.yaml
--- a/data/hostname/deposit.internal.staging.swh.network.yaml
+++ b/data/hostname/deposit.internal.staging.swh.network.yaml
@@ -4,31 +4,6 @@
netmask: 255.255.255.0
gateway: 192.168.130.1
-## db setup
-
-postgres::server::port: 5433
-postgres::server::listen_addresses:
- - localhost
- - 192.168.130.31
-postgres::server::network_access:
- - 192.168.100.0/24 # Monitoring
- - 192.168.130.0/24 # Staging services
-
-# Dbs to create
-swh::dbs:
- deposit:
- name: swh-deposit
- user: swh-deposit
-
-pgbouncer::auth_hba_file: /etc/postgresql/11/main/pg_hba.conf
-pgbouncer::listen_addr: 192.168.130.31
-pgbouncer::databases:
- - source_db: swh-deposit
- host: localhost
- auth_user: postgres
- port: 5433
- alias: staging-swh-deposit
-
## frontend
hitch::frontend: "[*]:443"
diff --git a/manifests/site.pp b/manifests/site.pp
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -166,9 +166,6 @@
node 'deposit.internal.staging.swh.network' {
include role::swh_deposit
- include profile::postgresql::server
- include profile::pgbouncer
- include profile::postgresql::client
}
node 'vault.internal.staging.swh.network' {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Jul 3 2025, 6:06 PM (4 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3219761
Attached To
D4372: staging: update all the services to use the new db1 server
Event Timeline
Log In to Comment