From 7b4a98df6d594a2f2192e5d00f50f4b9bc517cfb Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 1 Sep 2017 13:04:13 +0000 Subject: [PATCH] ship pg backup sshkeys in puppet --- modules/postgres/manifests/backup_server.pp | 4 ++++ .../backup_server/postgres-make-backup-sshauthkeys.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp index 2bda5dc9d..42c2364ee 100644 --- a/modules/postgres/manifests/backup_server.pp +++ b/modules/postgres/manifests/backup_server.pp @@ -28,6 +28,10 @@ class postgres::backup_server { mode => '0555', notify => Exec['postgres-make-backup-sshauthkeys'], } + file { '/etc/dsa/postgresql-backup/sshkeys-manual': + content => template('postgres/backup_server/sshkeys-manual.erb'), + notify => Exec['postgres-make-backup-sshauthkeys'], + } concat { '/etc/dsa/postgresql-backup/sshkeys-sources': notify => Exec['postgres-make-backup-sshauthkeys'], } diff --git a/modules/postgres/templates/backup_server/postgres-make-backup-sshauthkeys.erb b/modules/postgres/templates/backup_server/postgres-make-backup-sshauthkeys.erb index ae17363b4..c2fc21659 100755 --- a/modules/postgres/templates/backup_server/postgres-make-backup-sshauthkeys.erb +++ b/modules/postgres/templates/backup_server/postgres-make-backup-sshauthkeys.erb @@ -27,7 +27,7 @@ set -u CONFFILE=/etc/dsa/postgresql-backup/sshkeys-sources OUTFILE=/etc/ssh/userkeys/debbackup -HEAD=/etc/dsa/postgresql-backup/sshkeys-local +HEAD=/etc/dsa/postgresql-backup/sshkeys-manual : > "${OUTFILE}.new" -- 2.20.1