X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_source.pp;h=304e7d6cdd736fbdad4b4c2eeb3446273a0dc16e;hb=70091d4278b3b614652c8ef99dc692e89bc28967;hp=81d4a8ee1c8a520d26ec868d3a2fc596cb766462;hpb=acafab70dc47db33070f0c8c1306eee0841339c9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index 81d4a8ee1..304e7d6cd 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -1,20 +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'),
-	}
+  include postgres::backup_server::register_backup_clienthost
 
-	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 ]'
-		}
-	}
+  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'),
+  }
+
+  file { '/usr/local/bin/pg-receive-file-from-backup':
+    mode   => '0555',
+    source => 'puppet:///modules/postgres/pg-receive-file-from-backup',
+  }
+
+  ssh::keygen {'postgres': }
 }