projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move $make_base_backups to postgres::backup_server as it is local there; make some...
[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
1607db5
..
de45f72
100644
(file)
--- a/
modules/postgres/manifests/backup_server.pp
+++ b/
modules/postgres/manifests/backup_server.pp
@@
-2,6
+2,8
@@
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,7
+23,7
@@
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'),
}
mode => '0555',
content => template('postgres/backup_server/postgres-make-base-backups.erb'),
}
@@
-33,7
+35,7
@@
class postgres::backup_server {
concat::fragment { 'puppet-crontab--postgres-make_base_backups':
target => '/etc/cron.d/puppet-crontab',
content => @("EOF")
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 * * * * debbackup sleep $(( RANDOM \% 1200 )); chronic ${make_base_backups}
| EOF
}
| EOF
}