diff options
author | Varac <varac@leap.se> | 2014-12-04 17:30:07 +0800 |
---|---|---|
committer | Gerrit Code Review <gerrit2@review.leap.se> | 2014-12-04 17:30:07 +0800 |
commit | 60bd76583d46fe1c9f39804c7fd892fa9c1745d0 (patch) | |
tree | e938e8bc993104715c79595af313f9d8485f5125 /puppet/modules/site_check_mk/manifests | |
parent | acd6dd2848f38ba1b728f263f297bc6d2ad9e4bb (diff) | |
parent | a84272aa77715a4029ebd06b38b7a5ad05e6acd0 (diff) |
Merge "Change nagios mail To: Header to contain the actual platform environment's contact email (Bug #6466)" into develop
Diffstat (limited to 'puppet/modules/site_check_mk/manifests')
-rw-r--r-- | puppet/modules/site_check_mk/manifests/server.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp index b384923c..1a866b9c 100644 --- a/puppet/modules/site_check_mk/manifests/server.pp +++ b/puppet/modules/site_check_mk/manifests/server.pp @@ -11,6 +11,7 @@ class site_check_mk::server { $hosts = hiera_hash('hosts') $all_hosts = inline_template ('<% @hosts.keys.sort.each do |key| -%>"<%= @hosts[key]["domain_internal"] %>", <% end -%>') $domains_internal = $nagios_hiera['domains_internal'] + $environments = $nagios_hiera['environments'] package { 'check-mk-server': ensure => installed, @@ -41,7 +42,7 @@ class site_check_mk::server { notify => Exec['check_mk-refresh'], require => Package['check-mk-server']; '/etc/check_mk/conf.d/host_contactgroups.mk': - source => 'puppet:///modules/site_check_mk/host_contactgroups.mk', + content => template('site_check_mk/host_contactgroups.mk'), notify => Exec['check_mk-refresh'], require => Package['check-mk-server']; '/etc/check_mk/conf.d/ignored_services.mk': |