diff options
| author | varac <varacanero@zeromail.org> | 2014-10-08 23:38:08 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-10-08 23:38:08 +0200 |
| commit | 7b463790a4e6c207cc99a4db6cfea872b74d75b0 (patch) | |
| tree | 721ff7fecfc710c0f750037d8fac663ee94869ca /puppet/modules/site_nagios/manifests/server.pp | |
| parent | 7bc79e68e5ca913d1d2843c48cde8f946feed09c (diff) | |
| parent | 36a1332f5f6e43591a47b89ec505541f84381667 (diff) | |
Merge branch '5216_nagios_hostgroups' into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server.pp')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index 85443917..b195c880 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -3,12 +3,19 @@ class site_nagios::server inherits nagios::base { # First, purge old nagios config (see #1467) class { 'site_nagios::server::purge': } - $nagios_hiera = hiera('nagios') - $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw']) - $nagios_hosts = $nagios_hiera['hosts'] + $nagios_hiera = hiera('nagios') + $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw']) + $nagios_hosts = $nagios_hiera['hosts'] + $domains_internal = $nagios_hiera['domains_internal'] - include nagios::defaults include nagios::base + include nagios::defaults::commands + include nagios::defaults::contactgroups + include nagios::defaults::contacts + include nagios::defaults::templates + include nagios::defaults::timeperiods + include nagios::defaults::plugins + class {'nagios': # don't manage apache class from nagios, cause we already include # it in site_apache::common @@ -55,4 +62,6 @@ class site_nagios::server inherits nagios::base { 'set missingok missingok', 'set ifempty notifempty', 'set copytruncate copytruncate' ] } + + ::site_nagios::server::hostgroup { $domains_internal: } } |