diff options
| author | Micah Anderson <micah@riseup.net> | 2011-04-11 12:30:51 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-04-11 12:30:51 -0400 |
| commit | 7735baa65f0dc37f94d4854fd62c817de94d64f2 (patch) | |
| tree | 1a4e7a70e27897e08e0e0bb754b4b4d1f2889967 /manifests/service/http.pp | |
| parent | 2f2eb1cb12a57d8a85801086b6fbfce19e9c7a1b (diff) | |
| parent | f2df62c9d17d481a3d616a4f2de9496638fadc0a (diff) | |
Merge commit 'f2df62c9d17d481a3d616a4f2de9496638fadc0a'
Conflicts:
manifests/defaults/commands.pp
Diffstat (limited to 'manifests/service/http.pp')
| -rw-r--r-- | manifests/service/http.pp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/manifests/service/http.pp b/manifests/service/http.pp index 5fd9890..8fd5059 100644 --- a/manifests/service/http.pp +++ b/manifests/service/http.pp @@ -8,6 +8,7 @@ define nagios::service::http( $check_domain = 'absent', $check_url = '/', $check_code = 'OK', + $use = 'generic-service', $ssl_mode = false ){ $real_check_domain = $check_domain ? { @@ -18,12 +19,14 @@ define nagios::service::http( 'force',true,'only': { nagios::service{"https_${name}_${check_code}": ensure => $ensure, + use => $use, check_command => "check_https_url_regex!${real_check_domain}!${check_url}!'${check_code}'", } case $ssl_mode { 'force': { nagios::service{"httprd_${name}": ensure => $ensure, + use => $use, check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'301'", } } @@ -34,6 +37,7 @@ define nagios::service::http( false,true: { nagios::service{"http_${name}_${check_code}": ensure => $ensure, + use => $use, check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'${check_code}'", } } |