Merge branch 'develop' (0.5.0)

Conflicts:
	.gitignore

Change-Id: I778f3e1f1f4832f5894bc149ead67e9a4becf304

1 files changed, 13 insertions, 13 deletions

diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp
index 6ef3cbf5..8d2a310b 100644
--- a/puppet/modules/site_nagios/manifests/add_service.pp
+++ b/puppet/modules/site_nagios/manifests/add_service.pp
@@ -3,19 +3,19 @@ define site_nagios::add_service (
 
   case $service {
     'webapp': {
-      $check_command       = 'check_https_cert'
-      $service_description = 'Website Certificate'
+      nagios_service {
+        "${name}_cert":
+          use                 => 'generic-service',
+          check_command       => 'check_https_cert',
+          service_description => 'Website Certificate',
+          host_name           => $hostname;
+        "${name}_website":
+          use                 => 'generic-service',
+          check_command       => 'check_https',
+          service_description => 'Website',
+          host_name           => $hostname
+      }
     }
-    default:  {
-      #notice ("No Nagios service check for service \"$service\"")
-    }
-  }
-
-  if ( $check_command != '' ) {
-    nagios_service { $name:
-      use                 => 'generic-service',
-      check_command       => $check_command,
-      service_description => $service_description,
-      host_name           => $hostname }
+    default:  {}
   }
 }