X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpostgres%2Fmanifests%2Fbackup_source.pp;fp=modules%2Fpostgres%2Fmanifests%2Fbackup_source.pp;h=146726ace08e0693398358ae040c9194d44cbd15;hb=e2179b02047f4b3f0407d62fb706093f5bcef91f;hp=d67f6756e3c59c5fff400092c85acf68c04903fe;hpb=9cce4adf2d4b5997809e984d6ada29e8a6d3e9cf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index d67f6756e..146726ace 100644
--- 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 ! $::postgres_key {
-		exec { 'create-postgres-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] {