X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nagios-nrpe.spec;h=9e86311f08740a799f418a0a8c7d4e31e80d0dfb;hb=5dffe4d732294312e149567d729219e2a8e4b5e5;hp=e689c7051df1c94a5c229daea4c2decd669e2f19;hpb=f384e93fb949d6057a09d1527cc8dda848380632;p=packages%2Fnagios-nrpe.git

diff --git a/nagios-nrpe.spec b/nagios-nrpe.spec
index e689c70..9e86311 100644
--- a/nagios-nrpe.spec
+++ b/nagios-nrpe.spec
@@ -1,60 +1,72 @@
-%define 	nsusr		nagios
-%define		nsgrp		nagios
 Summary:	Nagios remote plugin execution service/plugin
-Summary(pl):	Demon i wtyczka zdalnego wywo³ywania wtyczek Nagios
+Summary(pl.UTF-8):	Demon i wtyczka zdalnego wywoływania wtyczek Nagios
 Name:		nagios-nrpe
-Version:	2.0
-Release:	2
+Version:	2.12
+Release:	8
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagios/nrpe-%{version}.tar.gz
-# Source0-md5:	70ef9502a3b7e49fa520dbceabfa04d0
+# Source0-md5:	b2d75e2962f1e3151ef58794d60c9e97
 Source1:	nrpe.init
+Source2:	nrpe-command.cfg
+Patch0:		%{name}-config.patch
 URL:		http://www.nagios.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	rpmbuild(macros) >= 1.159
+BuildRequires:	openssl-devel
 BuildRequires:	openssl-tools
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/bin/id
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
-Requires(post,postun):	/sbin/chkconfig
-Requires:	nagios-plugins
-Provides:	group(%{nsgrp})
-Provides:	user(%{nsusr})
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,preun):	/sbin/chkconfig
+Requires:	nagios-common
+Requires:	rc-scripts
+Provides:	nagios-core
 Obsoletes:	netsaint-nrpe
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/nagios
 %define		_datadir	%{_prefix}/share/%{name}
 %define		_plugindir	%{_libdir}/nagios/plugins
+%define		_libexecdir	%{_plugindir}
 %define		_localstatedir	%{_var}/log/nagios
 %define		nsport		5666
 
 %description
-Nagios nrpe allows you to remotely execute plugins on other hosts
-and report the plugin output back to the monitoring host.
-
-%description -l pl
-Nagios npre pozwala zdalnie uruchamiaæ wtyczki na innych hostach,
-a wynik ich dzia³ania zwracaæ z powrotem do hosta monitoruj±cego.
-
-%package plugin
+NRPE is an addon for Nagios that allows you to execute "local" plugins
+(like check_disk, check_procs, etc.) on remote hosts. The check_nrpe
+plugin is called from Nagios and makes plugin execution requests to
+the NRPE daemon running on the remote host (either as a standalone
+daemon or as a service under inetd). Supports passing command
+arguments to server, as well as native SSL/TLS encryption (anonymous
+DH mode).
+
+%description -l pl.UTF-8
+NRPE to dodatek do Nagiosa pozwalający na wywoływanie "lokalnych"
+wtyczek (takich jak check_disk, check_procs itp.) na zdalnych
+maszynach. Wtyczka check_nrpe jest wywoływana z poziomu Nagiosa i
+wysyła żądania uruchomienia wtyczek do demona NRPE działającego na
+zdalnej maszynie (jako samodzielny demon lub usługa inetd). Obsługuje
+przekazywanie argumentów poleceń do serwera, a także natywne
+szyfrowanie SSL/TLS (w trybie anonimowego DH).
+
+%package -n nagios-plugin-check_nrpe
 Summary:	check_nrpe plugin for Nagios
-Summary(pl):	Wtyczka check_nrpe dla Nagiosa
+Summary(pl.UTF-8):	Wtyczka check_nrpe dla Nagiosa
 Group:		Networking
+Requires:	nagios-core
+Provides:	%{name}-plugin = %{version}-%{release}
+Obsoletes:	%{name}-plugin < 2.12-6
 
-%description plugin
+%description -n nagios-plugin-check_nrpe
 check_nrpe plugin for Nagios. This plugin allows running plugins on
 remote machines using nrpe service.
 
-%description plugin -l pl
-Wtyczka check_nrpe dla Nagiosa. Pozwala na zdalne uruchamianie
-wtyczek na innych komputerach za pomoc± demona nrpe.
+%description -n nagios-plugin-check_nrpe -l pl.UTF-8
+Wtyczka check_nrpe dla Nagiosa. Pozwala na zdalne uruchamianie wtyczek
+na innych komputerach za pomocą demona nrpe.
 
 %prep
 %setup -q -n nrpe-%{version}
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -63,24 +75,20 @@ wtyczek na innych komputerach za pomoc
 %configure \
 	--with-init-dir=/etc/rc.d/init.d \
 	--with-nrpe-port=%{nsport} \
-	--with-nrpe-user=%{nsusr} \
-	--with-nrpe-grp=%{nsgrp} \
-	--prefix=%{_prefix} \
-	--exec-prefix=%{_sbindir} \
-	--bindir=%{_sbindir} \
-	--libexecdir=%{_plugindir} \
-	--datadir=%{_prefix}/share/nagios \
-	--sysconfdir=%{_sysconfdir} \
-	--localstatedir=%{_localstatedir} 
+	--with-nrpe-user=nagios \
+	--with-nrpe-grp=nagios \
+	--enable-ssl \
+	--enable-command-args
 
 %{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir},%{_libdir}/nagios/plugins,%{_sbindir}} \
-	$RPM_BUILD_ROOT%{_localstatedir}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/plugins,%{_libdir}/nagios/plugins,%{_sbindir}} \
+	$RPM_BUILD_ROOT{%{_localstatedir},/var/run/nrpe}
 
-install nrpe.cfg $RPM_BUILD_ROOT/etc/nagios/nrpe.cfg
+install sample-config/nrpe.cfg $RPM_BUILD_ROOT%{_sysconfdir}/nrpe.cfg
+sed -e 's,@plugindir@,%{_plugindir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/plugins/check_nrpe.cfg
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/nrpe
 install src/nrpe $RPM_BUILD_ROOT%{_sbindir}
 install src/check_nrpe $RPM_BUILD_ROOT%{_plugindir}
@@ -88,62 +96,35 @@ install src/check_nrpe $RPM_BUILD_ROOT%{_plugindir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-if [ -n "`getgid %{nsgrp}`" ]; then
-	if [ "`getgid %{nsgrp}`" != "72" ]; then
-		echo "Error: group %{nsgrp} doesn't have gid=72. Correct this before installing %{name}." 1>&2
-		exit 1
-	fi
-else
-	if [ -n "`getgid netsaint`" -a "`getgid netsaint`" = "72" ]; then
-		/usr/sbin/groupmod -n %{nsgrp} netsaint
-	else
-		/usr/sbin/groupadd -g 72 -f %{nsgrp}
-	fi
-fi
-if [ -n "`id -u %{nsusr} 2>/dev/null`" ]; then
-	if [ "`id -u %{nsusr}`" != "72" ]; then
-		echo "Error: user %{nsusr} doesn't have uid=72. Correct this before installing %{name}." 1>&2
-		exit 1
-	fi
-else
-	if [ -n "`id -u netsaint 2>/dev/null`" -a "`id -u netsaint`" = "72" ]; then
-		/usr/sbin/usermod -d /tmp -l %{nsusr} netsaint
-	else
-		/usr/sbin/useradd -u 72 -d %{_libdir}/%{nsusr} -s /bin/false -c "%{name} User" -g %{nsgrp} %{nsusr} 1>&2
-	fi
-fi
-
 %post
 /sbin/chkconfig --add nrpe
-if [ -f /var/lock/subsys/nrpe ]; then
-	/etc/rc.d/init.d/nrpe restart 1>&2
-fi
+%service nrpe restart
 
 %preun
 if [ "$1" = "0" ] ; then
-	if [ -f /var/lock/subsys/nrpe ]; then
-		/etc/rc.d/init.d/nrpe stop 1>&2
-	fi
+	%service nrpe stop
 	/sbin/chkconfig --del nrpe
 fi
 
-%postun
-if [ "$1" = "0" ]; then
-	%userremove %{nsusr}
-	%groupremove %{nsgrp}
+%triggerpostun -- %{name} < 2.6-1.1
+%{__sed} -i -e 's,/var/run/nrpe.pid,/var/run/nrpe/nrpe.pid,' %{_sysconfdir}/nrpe.cfg
+
+%triggerpostun -n nagios-plugin-check_nrpe -- nagios-plugin-check_nrpe < 2.12-7.1
+if [ -f %{_sysconfdir}/plugins/nrpe.cfg.rpmsave ]; then
+	cp -f %{_sysconfdir}/plugins/check_nrpe.cfg{,.rpmnew}
+	mv -f %{_sysconfdir}/plugins/{nrpe.cfg.rpmsave,check_nrpe.cfg}
+	sed -i -e 's,-c \$ARG1\$,$ARG1$,' %{_sysconfdir}/plugins/check_nrpe.cfg
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc Changelog LEGAL README* SECURITY
-%attr(754,root,root) /etc/rc.d/init.d/nrpe
-%attr(751,root,%{nsgrp}) %dir %{_sysconfdir}
-%attr(644,root,%{nsgrp}) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/nrpe.cfg
+%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nrpe.cfg
 %attr(755,root,root) %{_sbindir}/nrpe
-%dir %{_libdir}/nagios
+%attr(754,root,root) /etc/rc.d/init.d/nrpe
+%dir %attr(775,root,nagios) /var/run/nrpe
 
-%files plugin
+%files -n nagios-plugin-check_nrpe
 %defattr(644,root,root,755)
-%dir %{_plugindir}
-%attr(755,root,root) %{_plugindir}/*
+%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugins/check_nrpe.cfg
+%attr(755,root,root) %{_plugindir}/check_nrpe