roles::postgresql::server now sets up postgres::cluster for all clusters

[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 0c9407b..304e7d6 100644 (file)
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -1,51 +1,21 @@
 #
+# See dsa-wiki input/howto/postgres-backup.creole for some documentation
+#
 class postgres::backup_source {
-       file { "/usr/local/bin/pg-backup-file":
-               mode    => '0555',
-               source  => "puppet:///modules/roles/postgresql_server/pg-backup-file",
-       }
-       file { "/usr/local/bin/pg-receive-file-from-backup":
-               mode    => '0555',
-               source  => "puppet:///modules/roles/postgresql_server/pg-receive-file-from-backup",
-       }
-       file { "/etc/dsa/pg-backup-file.conf":
-               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 ]'
-               }
-       }
+  include postgres::backup_server::register_backup_clienthost
 
+  file { '/usr/local/bin/pg-backup-file':
+    mode   => '0555',
+    source => 'puppet:///modules/postgres/backup_source/pg-backup-file',
+  }
+  file { '/etc/dsa/pg-backup-file.conf':
+    content => template('postgres/backup_source/pg-backup-file.conf.erb'),
+  }
 
-       if $::hostname in [melartin, vittoria] {
-               postgres::backup_cluster { $::hostname:
-                       pg_version => '9.6',
-               }
-       }
-       if $::hostname in [buxtehude] {
-               postgres::backup_cluster { $::hostname:
-                       pg_version => '9.6',
-                       pg_port => 5433,
-               }
-               postgres::backup_cluster { "${::hostname}-debbugs":
-                       pg_version => '9.6',
-                       pg_port => 5441,
-                       pg_cluster => 'debbugs',
-               }
-       }
-       if $::hostname in [danzi] {
-               postgres::backup_cluster { "${::hostname}-debconf":
-                       pg_version => '9.6',
-                       pg_port => 5434,
-                       pg_cluster => 'debconf',
-               }
-       }
+  file { '/usr/local/bin/pg-receive-file-from-backup':
+    mode   => '0555',
+    source => 'puppet:///modules/postgres/pg-receive-file-from-backup',
+  }
 
-       if $::hostname in [melartin, vittoria, godard, buxtehude, danzi] {
-               postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
-               }
-       }
+  ssh::keygen {'postgres': }
 }