From 0f47539146baa793a17739ede0137312d333bb9e Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 6 Feb 2013 23:37:32 +0100
Subject: nagios: don't check openvpn, check cmd doesn't work

---
 puppet/modules/site_nagios/manifests/add_service.pp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'puppet')

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\"")
-- 
cgit v1.2.3