summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-10-09 18:49:26 +0000
committerMicah <micah@riseup.net>2015-10-09 18:49:26 +0000
commit71f8db0adc48de70af89892441569af97d646010 (patch)
tree55da531addcfca4ddc989cbed147387da75bc7ca /manifests
parent2cd1b529fc18847712760b15c9412b10d1cee712 (diff)
parent32760cb4d265a2cf74e6cd0014137b7883ee80a4 (diff)
Merge branch 'check_http_sni_support' into 'master'
Add --sni to check_http --ssl commands Makes sure correct SSL certificate is selected on hosts which use SNI for SSL, and also avoids some sites returning a `HTTP CRITICAL - Error on receive` error. Does not seem to affect non-SNI hosts. See merge request !13
Diffstat (limited to 'manifests')
-rw-r--r--manifests/defaults/commands.pp14
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp
index 777a74e..3521d94 100644
--- a/manifests/defaults/commands.pp
+++ b/manifests/defaults/commands.pp
@@ -10,15 +10,15 @@ class nagios::defaults::commands {
check_dummy:
command_line => '$USER1$/check_dummy $ARG1$';
check_https_cert:
- command_line => '$USER1$/check_http --ssl -C 20 -H $HOSTADDRESS$ -I $HOSTADDRESS$';
+ command_line => '$USER1$/check_http --ssl --sni -C 20 -H $HOSTADDRESS$ -I $HOSTADDRESS$';
check_http_url:
command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$';
check_http_url_regex:
command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -e $ARG4$';
check_https_url:
- command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$';
+ command_line => '$USER1$/check_http --ssl --sni -H $ARG1$ -u $ARG2$';
check_https_url_regex:
- command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -e $ARG3$';
+ command_line => '$USER1$/check_http --ssl --sni -H $ARG1$ -u $ARG2$ -e $ARG3$';
check_mysql_db:
command_line => '$USER1$/check_mysql -H $ARG1$ -P $ARG2$ -u $ARG3$ -p $ARG4$ -d $ARG5$';
check_ntp_time:
@@ -60,17 +60,17 @@ class nagios::defaults::commands {
check_http:
command_line => '$USER1$/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$';
check_https:
- command_line => '$USER1$/check_http --ssl -H $HOSTADDRESS$ -I $HOSTADDRESS$';
+ command_line => '$USER1$/check_http --ssl --sni -H $HOSTADDRESS$ -I $HOSTADDRESS$';
check_https_cert:
- command_line => '$USER1$/check_http --ssl -C 20 -H $HOSTADDRESS$ -I $HOSTADDRESS$';
+ command_line => '$USER1$/check_http --ssl --sni -C 20 -H $HOSTADDRESS$ -I $HOSTADDRESS$';
check_http_url:
command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$';
check_http_url_regex:
command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -e $ARG4$';
check_https_url:
- command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$';
+ command_line => '$USER1$/check_http --ssl --sni -H $ARG1$ -u $ARG2$';
check_https_url_regex:
- command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -e $ARG3$';
+ command_line => '$USER1$/check_http --ssl --sni -H $ARG1$ -u $ARG2$ -e $ARG3$';
check_mysql:
command_line => '$USER1$/check_mysql -H $ARG1$ -P $ARG2$ -u $ARG3$ -p $ARG4$';
check_mysql_db: