Merge branch 'master' into m-p

This commit is contained in:
Jan Wagner 2014-06-23 23:06:34 +02:00
commit dc2ddb19f7

View file

@ -19,7 +19,7 @@ define command{
# 'check_squid' command definition
define command{
command_name check_squid
command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' -e 'HTTP/1.0 200 OK'
command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$'
}
# 'check_https' command definition
@ -77,7 +77,7 @@ define command{
# 'check_squid_4' command definition
define command{
command_name check_squid_4
command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' -e 'HTTP/1.0 200 OK' -4
command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' -4
}
# 'check_https_4' command definition