ship pg backup sshkeys in puppet

diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp
index 2bda5dc..42c2364 100644 (file)
--- 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 ae17363..c2fc216 100755 (executable)
--- 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"