packages: nagios-plugin-check_multi/nagios-plugin-check_multi.spec, nagios-...

[glen]

Author: glen                         Date: Mon Jun 25 19:18:41 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add default nagios plugin config
- private tmpdir
- getopt req

---- Files affected:
packages/nagios-plugin-check_multi:
   nagios-plugin-check_multi.spec (1.3 -> 1.4) , check_multi.cfg (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec
diff -u packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.3 packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.4
--- packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.3	Mon Jun 25 21:07:02 2012
+++ packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec	Mon Jun 25 21:18:35 2012
@@ -8,15 +8,17 @@
 Summary:	Multi purpose wrapper plugin for Nagios/Icinga
 Name:		nagios-plugin-%{plugin}
 Version:	0.26
-Release:	0.11
+Release:	0.14
 License:	GPL v2
 Group:		Networking
 URL:		http://my-plugin.de/wiki/projects/check_multi/start
 Source0:	http://my-plugin.de/check_multi/%{plugin}-stable-%{version}.tar.gz
 # Source0-md5:	38f822c3911c0cd5e625e859237ff902
+Source1:	%{plugin}.cfg
 BuildRequires:	perl-base
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	sed >= 4.0
+Requires:	perl(Getopt::Long) >= 2.27
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,6 +57,9 @@
 	--libexecdir=%{plugindir} \
 	--with-plugin_path=%{plugindir} \
 	--with-checkresults_dir=/var/spool/nagios/checkresults \
+	--with-tmp_dir=/var/spool/nagios/%{plugin} \
+	--with-tmp_etc=/var/spool/nagios/%{plugin}/etc \
+	--with-tmp_dir_permissions=0770 \
 	%{nil}
 
 %if %{with tests}
@@ -63,6 +68,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/var/spool/nagios/%{plugin}/etc
 %{__make} install \
 	-C plugins \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -72,15 +78,21 @@
 	CFGDIR=%{_examplesdir}/%{name}-%{version} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc Changelog CM_VERSION LICENSE THANKS README
+%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{plugin}.cfg
 %dir %{_sysconfdir}/%{plugin}
 %attr(755,root,root) %{plugindir}/check_multi
 
+%dir %attr(770,root,nagios) /var/spool/nagios/%{plugin}
+%dir %attr(770,root,nagios) /var/spool/nagios/%{plugin}/etc
+
 %dir %{_examplesdir}/%{name}-%{version}
 %{_examplesdir}/%{name}-%{version}/*.cmd
 
@@ -100,6 +112,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2012/06/25 19:18:35  glen
+- add default nagios plugin config
+- private tmpdir
+- getopt req
+
 Revision 1.3  2012/06/25 19:07:02  glen
 - just define _localstatedir macro
 

================================================================
Index: packages/nagios-plugin-check_multi/check_multi.cfg
diff -u /dev/null packages/nagios-plugin-check_multi/check_multi.cfg:1.1
--- /dev/null	Mon Jun 25 21:18:41 2012
+++ packages/nagios-plugin-check_multi/check_multi.cfg	Mon Jun 25 21:18:35 2012
@@ -0,0 +1,15 @@
+# Usage:
+# check_multi
+define command {
+	command_name    check_multi
+	command_line    /usr/lib/nagios/plugins/check_multi $ARG1$
+}
+
+define service {
+	use                     generic-service
+	name                    multi-service
+	service_description     check_multi
+	register                0
+
+	check_command           check_multi
+}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec?r1=1.3&r2=1.4