From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 17 Mar 2014 13:23:36 +0000 (+0100)
Subject: SSO breaks all sorts of stuff
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b22c82329d60ded1b0b870dc362ce6fc72abeafc;p=mirror%2Fdsa-nagios.git

SSO breaks all sorts of stuff
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a5fbe27..b3f9dca 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -814,7 +814,7 @@ servers:
   nono:
     address: 206.12.19.123
     parents: traetta
-    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost
   reger:
     address: 206.12.19.124
     parents: ganeti2
@@ -854,7 +854,7 @@ servers:
   diabelli:
     address: 206.12.19.136
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, broken_https_default_vhost
   bizet:
     address: 206.12.19.137
     parents: ganeti2
@@ -2277,6 +2277,7 @@ services:
     check: check_https
     hostgroups: apache-https
     excludehosts: handel,menotti
+    excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2285,6 +2286,12 @@ services:
     hosts: handel,menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
+  -
+    name: network service - https
+    check: dsa_check_https_any_status
+    hostgroups: broken_https_default_vhost
+    depends: "process - apache2 - master"
+    normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
diff --git a/config/static/checkcommands.cfg b/config/static/checkcommands.cfg
index b7cffad..91d55a4 100644
--- a/config/static/checkcommands.cfg
+++ b/config/static/checkcommands.cfg
@@ -75,3 +75,7 @@ define command{
 	command_name    dsa_check_https_want_auth
 	command_line    /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -e 'HTTP/1.1 401'
 }
+define command{
+	command_name    dsa_check_https_any_status
+	command_line    /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -e 'HTTP/1.1 '
+}