projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to modernize pg wal shipping ssh setup
[mirror/dsa-puppet.git]
/
modules
/
postgres
/
manifests
/
backup_server.pp
diff --git
a/modules/postgres/manifests/backup_server.pp
b/modules/postgres/manifests/backup_server.pp
index
1f95f3e
..
6d9b792
100644
(file)
--- a/
modules/postgres/manifests/backup_server.pp
+++ b/
modules/postgres/manifests/backup_server.pp
@@
-1,7
+1,9
@@
-#
+#
postgres backup server
class postgres::backup_server {
include postgres::backup_server::globals
class postgres::backup_server {
include postgres::backup_server::globals
+ $make_base_backups = '/usr/local/bin/postgres-make-base-backups'
+
ensure_packages ( [
'libhash-merge-simple-perl',
'libyaml-perl',
ensure_packages ( [
'libhash-merge-simple-perl',
'libyaml-perl',
@@
-21,19
+23,19
@@
class postgres::backup_server {
}
Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_base_backup |>>
}
Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_base_backup |>>
- file { $
postgres::backup_server::globals::
make_base_backups:
+ file { $make_base_backups:
mode => '0555',
content => template('postgres/backup_server/postgres-make-base-backups.erb'),
}
file { '/var/lib/dsa/postgres-make-base-backups':
ensure => directory,
mode => '0555',
content => template('postgres/backup_server/postgres-make-base-backups.erb'),
}
file { '/var/lib/dsa/postgres-make-base-backups':
ensure => directory,
- owner =>
'debbackup'
,
+ owner =>
$postgres::backup_server::globals::backup_unix_user
,
mode => '0755',
}
concat::fragment { 'puppet-crontab--postgres-make_base_backups':
target => '/etc/cron.d/puppet-crontab',
content => @("EOF")
mode => '0755',
}
concat::fragment { 'puppet-crontab--postgres-make_base_backups':
target => '/etc/cron.d/puppet-crontab',
content => @("EOF")
- */30 * * * *
debbackup sleep $(( RANDOM \% 1200 )); chronic ${$postgres::backup_server::globals::
make_base_backups}
+ */30 * * * *
${postgres::backup_server::globals::backup_unix_user} sleep $(( RANDOM \% 1200 )); chronic ${
make_base_backups}
| EOF
}
| EOF
}
@@
-73,6
+75,10
@@
class postgres::backup_server {
command => '/usr/local/bin/postgres-make-backup-sshauthkeys',
refreshonly => true,
}
command => '/usr/local/bin/postgres-make-backup-sshauthkeys',
refreshonly => true,
}
+ ssh::authorized_key_collect { 'postgres::backup_server':
+ target_user => $postgres::backup_server::globals::backup_unix_user,
+ collect_tag => $postgres::backup_server::globals::tag_source_sshkey,
+ }
####
# Maintain /etc/nagios/dsa-check-backuppg.conf
####
# Maintain /etc/nagios/dsa-check-backuppg.conf
@@
-82,14
+88,14
@@
class postgres::backup_server {
purge => true,
force => true,
recurse => true,
purge => true,
force => true,
recurse => true,
- notify => Exec['update dsa-check-backuppg
-manual
.conf'],
+ notify => Exec['update dsa-check-backuppg.conf'],
}
}
- file { '/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/
manual
.conf':
- content => template('postgres/backup_server/dsa-check-backuppg-
manual
.conf.erb'),
- notify => Exec['update dsa-check-backuppg
-manual
.conf']
+ file { '/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/
globals
.conf':
+ content => template('postgres/backup_server/dsa-check-backuppg-
globals
.conf.erb'),
+ notify => Exec['update dsa-check-backuppg.conf']
}
File<<| tag == $postgres::backup_server::globals::tag_dsa_check_backupp |>>
}
File<<| tag == $postgres::backup_server::globals::tag_dsa_check_backupp |>>
- exec { 'update dsa-check-backuppg
-manual
.conf':
+ exec { 'update dsa-check-backuppg.conf':
command => @(EOF),
perl -MYAML=LoadFile,Dump -MHash::Merge::Simple=merge -E 'say Dump(merge(map{LoadFile($_)}@ARGV))' /etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/*.conf > /etc/nagios/dsa-check-backuppg.conf
| EOF
command => @(EOF),
perl -MYAML=LoadFile,Dump -MHash::Merge::Simple=merge -E 'say Dump(merge(map{LoadFile($_)}@ARGV))' /etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/*.conf > /etc/nagios/dsa-check-backuppg.conf
| EOF
@@
-97,18
+103,19
@@
class postgres::backup_server {
refreshonly => true,
}
refreshonly => true,
}
+ file { '/etc/sudoers.d/backup-server':
+ mode => '0440',
+ content => template('postgres/backup_server/sudoers.erb'),
+ }
+
+
####
# Maintain .pgpass file on backup servers
# #
concat { $postgres::backup_server::globals::pgpassfile:
####
# Maintain .pgpass file on backup servers
# #
concat { $postgres::backup_server::globals::pgpassfile:
- owner =>
'debbackup'
,
- group =>
'debbackup'
,
+ owner =>
$postgres::backup_server::globals::backup_unix_user
,
+ group =>
$postgres::backup_server::globals::backup_unix_group
,
mode => '0400'
}
mode => '0400'
}
- concat::fragment{ 'pgpass-local':
- target => $postgres::backup_server::globals::pgpassfile,
- source => '/home/debbackup/.pgpass-local',
- order => '00'
- }
Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_source_pgpassline |>>
}
Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_source_pgpassline |>>
}