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,6 +3,7 @@ swh::deploy::reverse_proxy::services: - hedgedoc +swh::postgresql::version: '14' swh::postgresql::listen_addresses: - 0.0.0.0 swh::postgresql::network_accesses: 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,18 +1,4 @@ -hedgedoc::db::host: localhost - -swh::postgresql::version: '12' -swh::postgresql::port: 5433 - -swh::postgresql::datadir_base: "%{lookup('swh::base_directory')}/postgres" -swh::postgresql::datadir: "%{lookup('swh::postgresql::datadir_base')}/%{lookup('swh::postgresql::cluster_name')}" -swh::postgresql::network_accesses: - - 192.168.100.0/24 # Monitoring - - 192.168.130.0/24 # Staging services - -swh::dbs: - hedgedoc: - name: "%{alias('hedgedoc::db::database')}" - user: "%{alias('hedgedoc::db::username')}" +hedgedoc::db::host: db1.internal.admin.swh.network hedgedoc::release::version: 1.9.2 hedgedoc::release::digest: 052088a634731e0f9c28e40f9869281f24bf3fbb25173a341ba2c94496109f51 @@ -31,11 +17,5 @@ hedgedoc::keycloak::client::id: hedgedoc # hedgedoc::keycloak::client::secret in private-data - - 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 --- a/data/hostname/dali.internal.admin.swh.network.yaml +++ b/data/hostname/dali.internal.admin.swh.network.yaml @@ -1,4 +1,3 @@ -swh::postgresql::version: '14' swh::postgresql::shared_buffers: 8GB swh::dbs: diff --git a/site-modules/profile/manifests/hedgedoc.pp b/site-modules/profile/manifests/hedgedoc.pp --- a/site-modules/profile/manifests/hedgedoc.pp +++ b/site-modules/profile/manifests/hedgedoc.pp @@ -68,6 +68,8 @@ $sequelizerc_path = "${install_dir}/.sequelizerc" + # Template uses variables: + # - $db_url file {$sequelizerc_path: ensure => present, owner => $user, @@ -98,6 +100,12 @@ $config_json_path = "${install_dir}/config.json" + $pg_version = lookup('swh::postgresql::version') + $pg_client_package = "postgresql-client-${pg_version}" + package {$pg_client_package: + ensure => 'present', + } + file {$config_json_path: ensure => present, owner => $user, @@ -121,7 +129,7 @@ user => $user, umask => '0066', require => [ - Postgresql::Server::Db[$db_name], + Package[$pg_client_package], ], } @@ -129,7 +137,6 @@ command => "${install_dir}/bin/setup && touch ${install_flag}", cwd => $install_dir, require => [ - Postgresql::Server::Db[$db_name], File[$config_json_path], File[$sequelizerc_path], ], diff --git a/site-modules/role/manifests/swh_hedgedoc.pp b/site-modules/role/manifests/swh_hedgedoc.pp --- a/site-modules/role/manifests/swh_hedgedoc.pp +++ b/site-modules/role/manifests/swh_hedgedoc.pp @@ -1,4 +1,3 @@ class role::swh_hedgedoc inherits role::swh_database { - include profile::postgresql::server include profile::hedgedoc }