packages: nagios-plugin-check_openvpn/check_openvpn.cfg, nagios-plugin-chec...

glen glen at pld-linux.org
Fri Dec 9 22:06:55 CET 2011


Author: glen                         Date: Fri Dec  9 21:06:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- switch to perl version of script. current one timeouts when parsing response

---- Files affected:
packages/nagios-plugin-check_openvpn:
   check_openvpn.cfg (1.3 -> 1.4) , nagios-plugin-check_openvpn.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_openvpn/check_openvpn.cfg
diff -u packages/nagios-plugin-check_openvpn/check_openvpn.cfg:1.3 packages/nagios-plugin-check_openvpn/check_openvpn.cfg:1.4
--- packages/nagios-plugin-check_openvpn/check_openvpn.cfg:1.3	Wed Jul 28 12:16:20 2010
+++ packages/nagios-plugin-check_openvpn/check_openvpn.cfg	Fri Dec  9 22:06:50 2011
@@ -2,7 +2,7 @@
 # check_openvpn
 define command {
 	command_name    check_openvpn
-	command_line    /usr/lib/nagios/plugins/check_openvpn -t $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_openvpn -H $HOSTADDRESS$ $ARG1$
 }
 
 define service {

================================================================
Index: packages/nagios-plugin-check_openvpn/nagios-plugin-check_openvpn.spec
diff -u packages/nagios-plugin-check_openvpn/nagios-plugin-check_openvpn.spec:1.3 packages/nagios-plugin-check_openvpn/nagios-plugin-check_openvpn.spec:1.4
--- packages/nagios-plugin-check_openvpn/nagios-plugin-check_openvpn.spec:1.3	Sat May 15 00:13:07 2010
+++ packages/nagios-plugin-check_openvpn/nagios-plugin-check_openvpn.spec	Fri Dec  9 22:06:50 2011
@@ -1,20 +1,23 @@
 # $Revision$, $Date$
 %define		plugin	check_openvpn
+%include	/usr/lib/rpm/macros.perl
 Summary:	Nagios plugin to check OpenVPN server status
 Name:		nagios-plugin-%{plugin}
 Version:	0.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Networking
-Source0:	http://exchange.nagios.org/components/com_mtree/attachment.php?link_id=158&cf_id=24&/check_openvpn
-# Source0-md5:	238f7b64955a7cb070b8a9379dbf57bb
+Source0:	http://exchange.nagios.org/components/com_mtree/attachment.php?link_id=1459&cf_id=24/check_openvpn.pl
+# Source0-md5:	b3f00c6e1a37ec10f41b11609e738c4b
 Source1:	%{plugin}.cfg
-URL:		http://exchange.nagios.org/directory/Plugins/Security/VPN-Software/check_openvpn/details
-BuildRequires:	rpm-pythonprov
+URL:		http://exchange.nagios.org/directory/Plugins/Security/VPN-Software/check_openvpn_pl/details
+BuildRequires:	rpm-perlprov >= 4.1-13
 Requires:	nagios-common
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_noautoreq	perl(utils)
+
 %define		_sysconfdir	/etc/nagios/plugins
 %define		plugindir	%{_prefix}/lib/nagios/plugins
 
@@ -25,13 +28,13 @@
 
 %prep
 %setup -qcT
-%{__sed} -e '1s,^#!.*python,#!%{__python},' %{SOURCE0} > %{plugin}
+%{__sed} -e '/diagnostics/d' %{SOURCE0} > %{plugin}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{plugindir}}
 install -p %{plugin} $RPM_BUILD_ROOT%{plugindir}/%{plugin}
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,6 +50,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/12/09 21:06:50  glen
+- switch to perl version of script. current one timeouts when parsing response
+
 Revision 1.3  2010/05/14 22:13:07  sparky
 - BR: rpm-pythonprov
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_openvpn/check_openvpn.cfg?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_openvpn/nagios-plugin-check_openvpn.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list