X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpostgresql_server.pp;h=25aa3e5ddf65d2a68fa1b5ae93ce67c1033847dc;hb=bfcd2cf1ea494a37e5c6ce31f6d3cdfc7fd26433;hp=e90c27ee040de5b2ae77f6b534df8c8d59bb39bc;hpb=ff762dfdfbfdb5f5eead0b998c01a6e8feeeac67;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/postgresql_server.pp b/modules/roles/manifests/postgresql_server.pp
index e90c27ee0..25aa3e5dd 100644
--- a/modules/roles/manifests/postgresql_server.pp
+++ b/modules/roles/manifests/postgresql_server.pp
@@ -1,13 +1,20 @@
 class roles::postgresql_server {
 	file { "/usr/local/bin/pg-backup-file":
-		mode    => 555,
+		mode    => '0555',
 		source  => "puppet:///modules/roles/postgresql_server/pg-backup-file",
 	}
 	file { "/usr/local/bin/pg-receive-file-from-backup":
-		mode    => 555,
+		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 ]'
+		}
+	}
 }