diff --git a/data/deployments/admin/common.yaml b/data/deployments/admin/common.yaml --- a/data/deployments/admin/common.yaml +++ b/data/deployments/admin/common.yaml @@ -3,7 +3,20 @@ swh::deploy::reverse_proxy::services: - hedgedoc +swh::postgresql::listen_addresses: + - 0.0.0.0 +swh::postgresql::network_accesses: + - 192.168.100.0/24 # Monitoring + swh::postgresql::shared_buffers: 4GB +swh::postgresql::port: 5432 +swh::postgresql::cluster_name: "%{lookup('swh::postgresql::version')}/main" +swh::postgresql::datadir_base: "/srv/postgresql" +swh::postgresql::datadir: "%{lookup('swh::postgresql::datadir_base')}/%{lookup('swh::postgresql::cluster_name')}" + +hedgedoc::db::database: hedgedoc +hedgedoc::db::username: hedgedoc +# swh::deploy::hedgedoc::db::password: in private-data swh::deploy::hedgedoc::reverse_proxy::backend_http_host: bardo.internal.admin.swh.network swh::deploy::hedgedoc::reverse_proxy::backend_http_port: "3000" diff --git a/data/hostname/bardo.internal.admin.swh.network.yaml b/data/hostname/bardo.internal.admin.swh.network.yaml --- a/data/hostname/bardo.internal.admin.swh.network.yaml +++ b/data/hostname/bardo.internal.admin.swh.network.yaml @@ -1,23 +1,14 @@ hedgedoc::db::host: localhost -hedgedoc::db::database: hedgedoc -hedgedoc::db::username: hedgedoc -# hedgedoc::db::password: in private-data swh::postgresql::version: '12' swh::postgresql::port: 5433 -swh::postgresql::cluster_name: "%{lookup('swh::postgresql::version')}/main" + swh::postgresql::datadir_base: "%{lookup('swh::base_directory')}/postgres" swh::postgresql::datadir: "%{lookup('swh::postgresql::datadir_base')}/%{lookup('swh::postgresql::cluster_name')}" -swh::postgresql::listen_addresses: - - 0.0.0.0 swh::postgresql::network_accesses: - 192.168.100.0/24 # Monitoring - 192.168.130.0/24 # Staging services -postgresql::server::config_entries: - shared_buffers: "%{alias('swh::postgresql::shared_buffers')}" - cluster_name: "%{alias('swh::postgresql::cluster_name')}" - swh::dbs: hedgedoc: name: "%{alias('hedgedoc::db::database')}" @@ -44,3 +35,7 @@ hedgedoc::runtime_environment: production hedgedoc::log_level: info + +postgresql::server::config_entries: + shared_buffers: "%{alias('swh::postgresql::shared_buffers')}" + cluster_name: "%{alias('swh::postgresql::cluster_name')}" diff --git a/data/hostname/dali.internal.admin.swh.network.yaml b/data/hostname/dali.internal.admin.swh.network.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/dali.internal.admin.swh.network.yaml @@ -0,0 +1,23 @@ +swh::postgresql::version: '14' +swh::postgresql::shared_buffers: 8GB + +swh::dbs: + netbox: + name: "%{alias('netbox::db::database')}" + user: "%{alias('netbox::db::username')}" + password: "%{alias('netbox::db::password')}" + hedgedoc: + name: "%{alias('hedgedoc::db::database')}" + user: "%{alias('hedgedoc::db::username')}" + grafana: + name: "%{alias('grafana::db::username')}" + user: "%{alias('grafana::db::username')}" + password: "%{alias('grafana::db::password')}" + sentry: + name: "%{alias('sentry::postgres::dbname')}" + user: "%{alias('sentry::postgres::user')}" + password: "%{alias('sentry::postgres::password')}" + keycloak: + name: "%{alias('keycloak::postgres::dbname')}" + user: "%{alias('keycloak::postgres::user')}" + password: "%{alias('keycloak::postgres::password')}" diff --git a/manifests/site.pp b/manifests/site.pp --- a/manifests/site.pp +++ b/manifests/site.pp @@ -145,6 +145,10 @@ include profile::postgresql::client } +node 'dali.internal.admin.swh.network' { + include role::swh_admin_database +} + node "bardo.internal.admin.swh.network" { include role::swh_hedgedoc } diff --git a/site-modules/profile/manifests/postgresql/server.pp b/site-modules/profile/manifests/postgresql/server.pp --- a/site-modules/profile/manifests/postgresql/server.pp +++ b/site-modules/profile/manifests/postgresql/server.pp @@ -109,6 +109,8 @@ user => $db_user, password => $db_pass, owner => $db_user, + encoding => 'UTF8', + locale => 'C.UTF-8', require => Class['postgresql::server'] } diff --git a/site-modules/role/manifests/swh_admin_database.pp b/site-modules/role/manifests/swh_admin_database.pp new file mode 100644 --- /dev/null +++ b/site-modules/role/manifests/swh_admin_database.pp @@ -0,0 +1,5 @@ +class role::swh_admin_database inherits role::swh_base_database { + include profile::postgresql + include profile::postgresql::server + include profile::prometheus::sql +}