X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_server.pp;h=a5361b1e1cd52080914fc826ab7a881adb8ecc9e;hb=fec4861e676415e8952b36c308ed40f7ce060fc4;hp=913905eb1568f7633617aff2bbc9d3b80ea986c8;hpb=ba9d4e7eceff2f88efbac2b16a4f08997ccd9d80;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp
index 913905eb1..a5361b1e1 100644
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -37,10 +37,15 @@ class postgres::backup_server {
 		order  => '99',
 	}
 	file { '/etc/cron.d/puppet-postgres-make-base-backups': ensure => absent; }
+	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")
-			*/10 * * * 0 debbackup chronic ${$postgres::backup_server::globals::make_base_backups}
+			*/30 * * * * debbackup sleep $(( RANDOM \% 1200 )); chronic ${$postgres::backup_server::globals::make_base_backups}
 			| EOF
 	}
 
@@ -97,16 +102,7 @@ class postgres::backup_server {
 		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
+		ensure => 'absent',
 		notify => Exec['update dsa-check-backuppg-manual.conf']
 	}
 	File<<| tag == $postgres::backup_server::globals::tag_dsa_check_backupp |>>