From 316740527518218b9a13864a89f683a1b6de0756 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 28 Sep 2019 18:32:46 +0200 Subject: [PATCH] Stop special casing godard in postgres::backup_source --- modules/postgres/manifests/backup_source.pp | 6 ------ modules/roles/TODO | 2 ++ modules/salsa/manifests/database.pp | 9 +++++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp index 3b1e058fb..b406d0dbe 100644 --- a/modules/postgres/manifests/backup_source.pp +++ b/modules/postgres/manifests/backup_source.pp @@ -15,10 +15,4 @@ class postgres::backup_source { } ssh::keygen {'postgres': } - - - if $::hostname in [godard] { - postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}": - } - } } diff --git a/modules/roles/TODO b/modules/roles/TODO index 5778cc78e..282bf2914 100644 --- a/modules/roles/TODO +++ b/modules/roles/TODO @@ -5,3 +5,5 @@ - exim/templates/virtualdomains.erb should be moved into the respective roles using exim::vdomain + +- move the postgres::backup_server stuff out of the salsa/database manifest diff --git a/modules/salsa/manifests/database.pp b/modules/salsa/manifests/database.pp index ba3d17379..6a7d8c7c2 100644 --- a/modules/salsa/manifests/database.pp +++ b/modules/salsa/manifests/database.pp @@ -18,10 +18,6 @@ class salsa::database inherits salsa { require => Class['postgresql::server::contrib'], } - - - include postgres::backup_source - $pg_config_options = { 'track_counts' => 'yes', 'archive_mode' => 'yes', @@ -41,10 +37,15 @@ class salsa::database inherits salsa { } } + include postgres::backup_source + postgres::backup_cluster { $::hostname: pg_version => $postgresql::params::version, pg_port => $postgresql::params::port, do_role => true, do_hba => true, } + + postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}": + } } -- 2.20.1