manage danzi/main pg_hba

[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 3b1e058..304e7d6 100644 (file)
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -2,23 +2,20 @@
 # See dsa-wiki input/howto/postgres-backup.creole for some documentation
 #
 class postgres::backup_source {
+  include postgres::backup_server::register_backup_clienthost
+
   file { '/usr/local/bin/pg-backup-file':
     mode   => '0555',
-    source => 'puppet:///modules/roles/postgresql_server/pg-backup-file',
+    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'),
   }
+
   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'),
+    source => 'puppet:///modules/postgres/pg-receive-file-from-backup',
   }
 
   ssh::keygen {'postgres': }
-
-
-  if $::hostname in [godard] {
-    postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
-    }
-  }
 }