diff options
| author | mh <mh@immerda.ch> | 2011-02-06 22:57:49 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-02-06 23:00:35 +0100 |
| commit | c36629568dba81b7e7f8471ed248cf889e53f6a2 (patch) | |
| tree | aa9d6ce176ce775a545197d061fde0babbf72498 | |
| parent | 24248f83cf94ab445a09255f35bf76b8a9017122 (diff) | |
| parent | 256f04298f993dc2f5175def6904e1133b34bc0e (diff) | |
Merge remote branch 'leluitn/service_contactgroup'
| -rw-r--r-- | manifests/base.pp | 6 | ||||
| -rw-r--r-- | manifests/service.pp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index d0cbbf4..d5feb32 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -110,11 +110,11 @@ class nagios::base { notify => Service['nagios'], } Nagios_hostdependency <||> { - target => "${nagios_cfgdir}/conf.d/nagios_hostdependency.cfg", + target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostdependency.cfg", notify => Service['nagios'], } Nagios_hostescalation <||> { - target => "${nagios_cfgdir}/conf.d/nagios_hostescalation.cfg", + target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostescalation.cfg", notify => Service['nagios'], } Nagios_hostextinfo <||> { @@ -133,7 +133,7 @@ class nagios::base { notify => Service['nagios'], } Nagios_servicegroup <||> { - target => "${nagios_cfgdir}/conf.d/nagios_servicegroup.cfg", + target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_servicegroup.cfg", notify => Service['nagios'], } Nagios_servicedependency <||> { diff --git a/manifests/service.pp b/manifests/service.pp index 3e732b7..ffbbc72 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -53,6 +53,10 @@ define nagios::service ( Nagios_service["${real_name}"] { notification_options => $notification_options } } + if ($contact_groups != '') { + Nagios_service["${real_name}"] { contact_groups => $contact_groups } + } + if ($use == 'absent') { Nagios_service["${real_name}"] { use => 'generic-service' } } else { |