summaryrefslogtreecommitdiff
path: root/puppet/modules/site_check_mk/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-12-02 11:26:35 -0500
committerMicah Anderson <micah@leap.se>2014-12-02 22:58:13 -0500
commita84272aa77715a4029ebd06b38b7a5ad05e6acd0 (patch)
treecd4d4c165ced4ec283fbeab0071daaf735c2be51 /puppet/modules/site_check_mk/manifests
parenta3af7019efe6f5ff3daeeff474a8c31b1b3318c8 (diff)
Change nagios mail To: Header to contain the actual platform environment's contact email (Bug #6466)
Change-Id: Ib86ae771e0ac3b6f329a517a8a31c9ec54d33a05
Diffstat (limited to 'puppet/modules/site_check_mk/manifests')
-rw-r--r--puppet/modules/site_check_mk/manifests/server.pp3
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':