From 23c108a05c33bce01405eba026b8bfd90bc1aac8 Mon Sep 17 00:00:00 2001
From: Zev Benjamin <zev@zulip.com>
Date: Thu, 5 Jun 2014 11:47:16 -0700
Subject: [PATCH] nagios: Check HTTPS instead of HTTP

(imported from commit ba0bb76d9bea6661e5396308eb431ff95ef51771)
---
 puppet/zulip_internal/files/nagios3/commands.cfg        | 4 ++++
 puppet/zulip_internal/files/nagios3/conf.d/services.cfg | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/puppet/zulip_internal/files/nagios3/commands.cfg b/puppet/zulip_internal/files/nagios3/commands.cfg
index 79cc591c07..966e2d559e 100644
--- a/puppet/zulip_internal/files/nagios3/commands.cfg
+++ b/puppet/zulip_internal/files/nagios3/commands.cfg
@@ -166,3 +166,7 @@ define command{
        command_line    /usr/lib/nagios/plugins/check_by_ssh -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_worker_memory'
 }
 
+define command{
+       command_name     check_https_status
+       command_line     /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' --expect=200,302,401
+}
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/services.cfg b/puppet/zulip_internal/files/nagios3/conf.d/services.cfg
index 76a147c4c2..30f7adcf92 100644
--- a/puppet/zulip_internal/files/nagios3/conf.d/services.cfg
+++ b/puppet/zulip_internal/files/nagios3/conf.d/services.cfg
@@ -1,8 +1,8 @@
 define service {
         use                             generic-service
         hostgroup_name                  web
-        service_description             HTTP
-        check_command                   check_http
+        service_description             HTTPS
+        check_command                   check_https_status
         contact_groups                  page_admins
 }