diff options
| author | varac <varacanero@zeromail.org> | 2013-02-07 12:34:51 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-02-07 12:34:51 +0100 |
| commit | 93a514a61ccfd656796d5b5cd143ea4cfacbc15b (patch) | |
| tree | 37bb3f26e23060858336a5f5e38b5aac2fefc280 /puppet/modules/site_nagios/manifests/add_service.pp | |
| parent | 07cc737f655c9fc0afe50e9850963120114ee18e (diff) | |
| parent | 173b2dc3ecbdab2cacede4e50f6fa3f5daa3c683 (diff) | |
Merge branch 'feature/tor' into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests/add_service.pp')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/add_service.pp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index 280cb010..6ef3cbf5 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -2,14 +2,9 @@ define site_nagios::add_service ( $hostname, $ip_address, $openvpn_gw = '', $service) { case $service { - # don't deploy until we fix 1546 - 'openvpn': { - $check_command = "check_openvpn_server_ip_port!$openvpn_gw!1194" - $service_description = 'Openvpn' - } 'webapp': { - $check_command = 'check_https' - $service_description = 'Website' + $check_command = 'check_https_cert' + $service_description = 'Website Certificate' } default: { #notice ("No Nagios service check for service \"$service\"") |