[packages/nagios-plugins] - rel 2; work with name based vhosts

arekm arekm at pld-linux.org
Sun Aug 20 21:43:07 CEST 2017


commit f13924c46c1eaedcf9739efc331902e6ee4984e1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Aug 20 21:42:59 2017 +0200

    - rel 2; work with name based vhosts

 http.patch          | 23 +++++++++++++++++++++++
 nagios-plugins.spec |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index cbbddbc..f036740 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -17,7 +17,7 @@ Summary:	Host/service/network monitoring program plugins for Nagios
 Summary(pl.UTF-8):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
 Version:	2.1.4
-Release:	1
+Release:	2
 License:	GPL v3
 Group:		Networking
 Source0:	http://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
@@ -28,6 +28,7 @@ Source1:	%{name}-config-20150805.tar.xz
 Source2:	nagios-utils.php
 #Patch:		%{name}-shared.patch # needs finishing
 Patch0:		%{name}-tainted.patch
+Patch1:		http.patch
 Patch4:		%{name}-noroot.patch
 Patch5:		%{name}-check_ping-socket-filter-warning.patch
 Patch7:		%{name}-pgsql.patch
@@ -523,6 +524,7 @@ Wtyczki przekazane do projektu Nagios. Część z nich działa, część nie.
 %setup -q -a1
 mv nagios-plugins-config-*/* .
 %patch0 -p1
+%patch1 -p1
 %patch4 -p1
 %patch5 -p1
 %patch7 -p1
diff --git a/http.patch b/http.patch
new file mode 100644
index 0000000..b159881
--- /dev/null
+++ b/http.patch
@@ -0,0 +1,23 @@
+--- nagios-plugins-2.1.4.org/commands/check_http.cfg	2014-03-07 13:13:31.000000000 +0100
++++ nagios-plugins-2.1.4/commands/check_http.cfg	2017-08-20 21:40:54.871308710 +0200
+@@ -1,17 +1,17 @@
+ # 'check_http' command definition
+ define command {
+ 	command_name    check_http
+-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -f warning $ARG1$
++	command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $HOSTNAME$ -f warning $ARG1$
+ }
+ 
+ define command {
+ 	command_name    check_https
+-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -f warning -S $ARG1$
++	command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $HOSTNAME$ -f warning -S $ARG1$
+ }
+ 
+ define command {
+ 	command_name    check_https.crt
+-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -S -C 14 $ARG1$
++	command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $HOSTNAME$ -S -C 14 $ARG1$
+ }
+ 
+ define service {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugins.git/commitdiff/f13924c46c1eaedcf9739efc331902e6ee4984e1



More information about the pld-cvs-commit mailing list