Add debconf.org cert

[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 c9c3d47..5a8aa83 100644 (file)
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -16,8 +16,7 @@ class postgres::backup_server {
        ####
        # Regularly pull base backups
        #
-       ensure_packages ( "postgresql-client-9.1", { ensure => 'installed' })
-       ensure_packages ( "postgresql-client-9.4", { ensure => 'installed' })
+       ensure_packages ( "postgresql-client-9.6", { ensure => 'installed' })
 
        concat { $postgres::backup_server::globals::make_base_backups:
                mode => '0555',
@@ -37,20 +36,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
        }
 
        ####
@@ -105,19 +100,6 @@ class postgres::backup_server {
                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/moszumanska.conf':
-               ensure => ($::hostname in [backuphost]) ? {
-                               true    => 'absent',
-                               default => 'present'
-                       },
-               content  => @(EOF),
-                               --- 
-                               backups:
-                                 moszumanska:
-                                   main:
-                               | EOF
-               notify => Exec['update dsa-check-backuppg-manual.conf']
-       }
        File<<| tag == $postgres::backup_server::globals::tag_dsa_check_backupp |>>
        ensure_packages ( "libhash-merge-simple-perl", { ensure => 'installed' })
        exec { "update dsa-check-backuppg-manual.conf":