Commit a17066e8 authored by mh's avatar mh
Browse files

make sure we copy what we had before

parent 54ae9ff1
...@@ -227,7 +227,7 @@ define webhosting::common( ...@@ -227,7 +227,7 @@ define webhosting::common(
default => '401' default => '401'
} }
nagios::service::http{$name: $default_nagios_vals = {
ensure => $nagios_ensure, ensure => $nagios_ensure,
check_domain => $nagios_check_domain, check_domain => $nagios_check_domain,
ssl_mode => $ssl_mode, ssl_mode => $ssl_mode,
...@@ -235,11 +235,15 @@ define webhosting::common( ...@@ -235,11 +235,15 @@ define webhosting::common(
use => $nagios_use, use => $nagios_use,
check_code => $real_nagios_check_code, check_code => $real_nagios_check_code,
} }
nagios::service::http{
$name:
* => $default_nagios_vals,
}
if 'additional_nagios_checks' in $configuration { if 'additional_nagios_checks' in $configuration {
$configuration['additional_nagios_checks'].each |$n,$values| { $configuration['additional_nagios_checks'].each |$n,$values| {
nagios::service::http{ nagios::service::http{
"${name}-${n}": "${name}-${n}":
* => $values, * => $default_nagios_vals + $values,
} }
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment