X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_server.pp;h=1607db502dc5a6170ed1fafd4de07785960119ee;hb=5fffbe18f4c7134aa14db4ae2afc03f6efce81d9;hp=1f95f3eb8ecfc253c40003e7f6d28c442ccd5040;hpb=60761867cccbfa7f472fb13fdd2d704d4cb32b92;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp
index 1f95f3eb8..1607db502 100644
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -82,14 +82,14 @@ class postgres::backup_server {
     purge   => true,
     force   => true,
     recurse => true,
-    notify  => Exec['update dsa-check-backuppg-manual.conf'],
+    notify  => Exec['update dsa-check-backuppg.conf'],
   }
-  file { '/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/manual.conf':
-    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/globals.conf':
+    content => template('postgres/backup_server/dsa-check-backuppg-globals.conf.erb'),
+    notify  => Exec['update dsa-check-backuppg.conf']
   }
   File<<| tag == $postgres::backup_server::globals::tag_dsa_check_backupp |>>
-  exec { 'update dsa-check-backuppg-manual.conf':
+  exec { 'update dsa-check-backuppg.conf':
     command     => @(EOF),
         perl -MYAML=LoadFile,Dump -MHash::Merge::Simple=merge -E 'say Dump(merge(map{LoadFile($_)}@ARGV))' /etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/*.conf > /etc/nagios/dsa-check-backuppg.conf
         | EOF