From 5fffbe18f4c7134aa14db4ae2afc03f6efce81d9 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 28 Sep 2019 19:58:53 +0200 Subject: [PATCH] rename dsa-check-backuppg-manual.conf --- modules/postgres/manifests/backup_server.pp | 10 +++++----- .../manifests/backup_server/register_backup_cluster.pp | 2 +- ...al.conf.erb => dsa-check-backuppg-globals.conf.erb} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename modules/postgres/templates/backup_server/{dsa-check-backuppg-manual.conf.erb => dsa-check-backuppg-globals.conf.erb} (100%) 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 diff --git a/modules/postgres/manifests/backup_server/register_backup_cluster.pp b/modules/postgres/manifests/backup_server/register_backup_cluster.pp index 5fdabab33..bc16a7646 100644 --- a/modules/postgres/manifests/backup_server/register_backup_cluster.pp +++ b/modules/postgres/manifests/backup_server/register_backup_cluster.pp @@ -45,6 +45,6 @@ define postgres::backup_server::register_backup_cluster ( ${pg_cluster}: | EOF tag => $postgres::backup_server::globals::tag_dsa_check_backupp, - notify => Exec['update dsa-check-backuppg-manual.conf'] + notify => Exec['update dsa-check-backuppg.conf'] } } diff --git a/modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb b/modules/postgres/templates/backup_server/dsa-check-backuppg-globals.conf.erb similarity index 100% rename from modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb rename to modules/postgres/templates/backup_server/dsa-check-backuppg-globals.conf.erb -- 2.20.1