rpms/nrpe/F-10 nrpe-directory_for_configs.diff, NONE, 1.1 import.log, 1.1, 1.2 nrpe.spec, 1.8, 1.9
Peter Lemenkov
peter at fedoraproject.org
Thu Sep 24 14:59:15 UTC 2009
- Previous message (by thread): rpms/nrpe/F-11 nrpe-directory_for_configs.diff, NONE, 1.1 import.log, 1.1, 1.2 nrpe.spec, 1.13, 1.14
- Next message (by thread): rpms/nrpe/EL-5 nrpe-directory_for_configs.diff, NONE, 1.1 import.log, 1.1, 1.2 nrpe.spec, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/pkgs/rpms/nrpe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29389/F-10
Modified Files:
import.log nrpe.spec
Added Files:
nrpe-directory_for_configs.diff
Log Message:
Added /etc/nrpe.d (bz# 515324)
nrpe-directory_for_configs.diff:
nrpe.cfg.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE nrpe-directory_for_configs.diff ---
diff -up nrpe-2.12/sample-config/nrpe.cfg.in.orig nrpe-2.12/sample-config/nrpe.cfg.in
--- nrpe-2.12/sample-config/nrpe.cfg.in.orig 2009-08-03 19:49:20.000000000 +0200
+++ nrpe-2.12/sample-config/nrpe.cfg.in 2009-08-03 19:50:43.000000000 +0200
@@ -169,8 +169,7 @@ connection_timeout=300
# This directive allows you to include definitions from config files (with a
# .cfg extension) in one or more directories (with recursion).
-#include_dir=<somedirectory>
-#include_dir=<someotherdirectory>
+include_dir=/etc/nrpe.d/
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 2 Feb 2009 16:08:19 -0000 1.1
+++ import.log 24 Sep 2009 14:59:15 -0000 1.2
@@ -1 +1,2 @@
nrpe-2_12-6_fc10:F-10:nrpe-2.12-6.fc10.src.rpm:1233590859
+nrpe-2_12-11_fc11:F-10:nrpe-2.12-11.fc11.src.rpm:1253804318
Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-10/nrpe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nrpe.spec 2 Feb 2009 16:08:20 -0000 1.8
+++ nrpe.spec 24 Sep 2009 14:59:15 -0000 1.9
@@ -2,7 +2,7 @@
Name: nrpe
Version: 2.12
-Release: 6%{?dist}
+Release: 11%{?dist}
Summary: Host/service/network monitoring agent for Nagios
Group: Applications/System
@@ -12,6 +12,7 @@ Source0: http://dl.sourceforge.net/nagio
Source1: nrpe.sysconfig
Patch0: nrpe-initreload.patch
Patch1: nrpe-read-extra-conf.patch
+Patch2: nrpe-directory_for_configs.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,7 +27,7 @@ Provides: nagios-nrpe = %{version}-%{rel
%description
Nrpe is a system daemon that will execute various Nagios plugins
locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin. Various plugins that can be executed by the
+check_nrpe plugin. Various plugins that can be executed by the
daemon are available at:
http://sourceforge.net/projects/nagiosplug
@@ -41,7 +42,7 @@ Provides: check_nrpe = %{version}-%{rele
%description -n nagios-plugins-nrpe
Nrpe is a system daemon that will execute various Nagios plugins
locally on behalf of a remote (monitoring) host that uses the
-check_nrpe plugin. Various plugins that can be executed by the
+check_nrpe plugin. Various plugins that can be executed by the
daemon are available at:
http://sourceforge.net/projects/nagiosplug
@@ -51,6 +52,7 @@ This package provides the nrpe plugin fo
%setup -q
%patch0 -p0
%patch1 -p0 -b .sysconfig
+%patch2 -p1 -b .dir
%build
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -76,6 +78,8 @@ install -D -p -m 0644 sample-config/nrpe
install -D -p -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
install -D -p -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
+install -d %{buildroot}%{_sysconfdir}/nrpe.d
+
%clean
rm -rf %{buildroot}
@@ -102,16 +106,32 @@ fi
%{_initrddir}/nrpe
%{_sbindir}/nrpe
%dir %{_sysconfdir}/nagios
+%dir %{_sysconfdir}/nrpe.d
%config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%doc Changelog LEGAL README
+%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
%files -n nagios-plugins-nrpe
%defattr(-,root,root,-)
%{_libdir}/nagios/*
-%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
+%doc Changelog LEGAL README
%changelog
+* Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
+- Fixed BZ# 515324
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-10
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 21 2009 Mike McGrath <mmcgrath at redhat.com> - 2.12-7
+- Re-fix for 477527
+
* Mon Feb 2 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-6
- Fixed BZ# 449174
- Clean up (in order to disable rpmlint warnings)
- Previous message (by thread): rpms/nrpe/F-11 nrpe-directory_for_configs.diff, NONE, 1.1 import.log, 1.1, 1.2 nrpe.spec, 1.13, 1.14
- Next message (by thread): rpms/nrpe/EL-5 nrpe-directory_for_configs.diff, NONE, 1.1 import.log, 1.1, 1.2 nrpe.spec, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list