Merge remote-tracking branch 'origin/master' into staging

[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 60a948a..377dc86 100644 (file)
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -37,20 +37,16 @@ class postgres::backup_server {
                order  => '99',
        }
        file { '/etc/cron.d/puppet-postgres-make-base-backups': ensure => absent; }
-       if $::hostname in [backuphost] {
-               concat::fragment { 'dsa-puppet-stuff--porterbox-chroot-update':
-                       target => '/etc/cron.d/dsa-puppet-stuff',
-                       content  => @("EOF")
-                               20 1 * * 0 debbackup chronic ${$postgres::backup_server::globals::make_base_backups}
-                               | EOF
-               }
-       } else  {
-               concat::fragment { 'dsa-puppet-stuff--porterbox-chroot-update':
-                       target => '/etc/cron.d/dsa-puppet-stuff',
-                       content  => @("EOF")
-                               20 0 * * 6 debbackup chronic ${$postgres::backup_server::globals::make_base_backups}
-                               | EOF
-               }
+       file { '/var/lib/dsa/postgres-make-base-backups':
+               ensure => directory,
+               owner => 'debbackup',
+               mode => '0755',
+       }
+       concat::fragment { 'dsa-puppet-stuff--postgres-make_base_backups':
+               target => '/etc/cron.d/dsa-puppet-stuff',
+               content  => @("EOF")
+                       */30 * * * * debbackup sleep $(( RANDOM \% 1200 )); chronic ${$postgres::backup_server::globals::make_base_backups}
+                       | EOF
        }
 
        ####
@@ -66,6 +62,10 @@ class postgres::backup_server {
                mode   => '0555',
                notify  => Exec['postgres-make-backup-sshauthkeys'],
        }
+       file { '/usr/local/bin/postgres-make-one-base-backup':
+               source  => 'puppet:///modules/postgres/backup_server/postgres-make-one-base-backup',
+               mode   => '0555'
+       }
        file { '/etc/dsa/postgresql-backup/sshkeys-manual':
                content => template('postgres/backup_server/sshkeys-manual.erb'),
                notify  => Exec['postgres-make-backup-sshauthkeys'],