X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_source.pp;h=304e7d6cdd736fbdad4b4c2eeb3446273a0dc16e;hb=015fa6b401098df522b1adf8e574a88d581ef340;hp=b406d0dbea9116c59d579e0a018f3dfe4effb0a6;hpb=316740527518218b9a13864a89f683a1b6de0756;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index b406d0dbe..304e7d6cd 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -2,16 +2,19 @@
 # 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': }