eximconf: correct obsolete references to "/etc/exim"

[mirror/dsa-puppet.git] / modules / postgres / manifests / backup_source.pp

diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index 04a324d..d2443a1 100644 (file)
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -14,12 +14,7 @@ class postgres::backup_source {
                content => template('roles/postgresql_server/pg-backup-file.conf.erb'),
        }
 
-       if ! $::postgresql_key {
-               exec { 'create-postgresql-key':
-                       command => '/bin/su - postgres -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'',
-                       onlyif  => '/usr/bin/getent passwd postgres > /dev/null && ! [ -e /var/lib/postgresql/.ssh/id_rsa ]'
-               }
-       }
+       ssh::keygen {'postgres': }
 
 
        if $::hostname in [melartin, vittoria] {
@@ -50,8 +45,17 @@ class postgres::backup_source {
                }
        }
 
-       if $::hostname in [melartin, vittoria, godard, buxtehude, danzi] {
+       if $::hostname in [postgresql-manda-01] {
+               postgres::backup_cluster { "${::hostname}-bacula":
+                       pg_version => '11',
+                       pg_port => 5432,
+                       pg_cluster => 'bacula',
+               }
+       }
+
+       if $::hostname in [melartin, vittoria, godard, buxtehude, danzi, postgresql-manda-01] {
                postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
                }
        }
+
 }