From 3f12bbd92d567f62d52bf7791bfaacd2764c251a Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 27 Jul 2017 12:11:26 +0100 Subject: [PATCH] added and linked add_contactgroups_rules --- README.md | 4 ++++ manifests/nagios/objects/add_contactgroups.pp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 10a3e6c..5aa0913 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ Nagios is a powerful open source software solution for monitoring your IT enviro * [PuppetDB] * [SELINUX](#selinux) * [Certbot](#certbot) +* [Httpd vHost Files](#httpd-vhost-files) +* [Manage additional resources] * [Known Problems](#known-problems) * [Support](#support) * [Tests](#tests) @@ -120,6 +122,8 @@ If you prefer to use https but use self-signed certs or your own CA, simply set ### httpd vHost files by Default, Nagios creates its own nagios.conf file, which is not a vhost file and relies on the main ssd.conf. However, as Nagios might be running on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host. +### Manage additional resources + ### Known Problems ### Support diff --git a/manifests/nagios/objects/add_contactgroups.pp b/manifests/nagios/objects/add_contactgroups.pp index 02a2ba6..ebadf71 100644 --- a/manifests/nagios/objects/add_contactgroups.pp +++ b/manifests/nagios/objects/add_contactgroups.pp @@ -31,14 +31,14 @@ $ng_contactgroup_register = '1', $ng_nagios_server = $::cd_nagios::params::ng_nagios_server $ng_tgt_contactgroup_add = $::cd_nagios::params::ng_tgt_contactgroup_add -$ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb +$ng_cntctgrps_rule_erb = $::cd_nagios::params::ng_cntctgrps_rule_erb if $::fqdn == $ng_nagios_server { concat::fragment { $name: target => $ng_tgt_contactgroup_add, - content => template($ng_contacts_rule_erb), + content => template($ng_cntctgrps_rule_erb), } } }