X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_server.pp;h=a5361b1e1cd52080914fc826ab7a881adb8ecc9e;hb=613379c1d1814794d873352a4791c5556eac938f;hp=95fe38c5e76d01947ee640d5cbf4e8cc86b5f31d;hpb=efc15e2af690f92e64f81cc7b355c5bae75a7b58;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp
index 95fe38c5e..a5361b1e1 100644
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -45,7 +45,7 @@ class postgres::backup_server {
 	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}
+			*/30 * * * * debbackup sleep $(( RANDOM \% 1200 )); chronic ${$postgres::backup_server::globals::make_base_backups}
 			| EOF
 	}
 
@@ -102,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 |>>