From ea942b34344e2889779e3718c394687607a64c91 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 22 Aug 2013 18:15:55 +0200
Subject: remove silly naming as this anyway only makes it difficult to move
 checks

---
 manifests/service/http.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'manifests/service')

diff --git a/manifests/service/http.pp b/manifests/service/http.pp
index ef63abb..33921fa 100644
--- a/manifests/service/http.pp
+++ b/manifests/service/http.pp
@@ -18,14 +18,14 @@ define nagios::service::http(
     }
     case $ssl_mode {
         'force',true,'only': {
-            nagios::service{"https_${name}_${check_code}":
+            nagios::service{"https_${name}":
                 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}":
+                    nagios::service{"http_${name}":
                         ensure => $ensure,
                         use => $use,
                         check_command => "check_http_url_regex!${real_check_domain}!${port}!${check_url}!'301'",
@@ -36,7 +36,7 @@ define nagios::service::http(
     }
     case $ssl_mode {
         false,true: {
-            nagios::service{"http_${name}_${check_code}":
+            nagios::service{"http_${name}":
                 ensure => $ensure,
                 use => $use,
                 check_command => "check_http_url_regex!${real_check_domain}!${port}!${check_url}!'${check_code}'",
-- 
cgit v1.2.3