[packages/nagios-nrpe] trigger: ensure include_dir directive is enabled
glen
glen at pld-linux.org
Fri May 29 10:31:26 CEST 2015
commit 6102476e64e2f8df9efbb02aa36233142a39f314
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri May 29 11:30:40 2015 +0300
trigger: ensure include_dir directive is enabled
nagios-nrpe.spec | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/nagios-nrpe.spec b/nagios-nrpe.spec
index e5fd9d9..8669c8e 100644
--- a/nagios-nrpe.spec
+++ b/nagios-nrpe.spec
@@ -2,7 +2,7 @@ Summary: Nagios remote plugin execution service/plugin
Summary(pl.UTF-8): Demon i wtyczka zdalnego wywoływania wtyczek Nagios
Name: nagios-nrpe
Version: 2.15
-Release: 4
+Release: 5
License: GPL v2
Group: Networking
Source0: http://downloads.sourceforge.net/nagios/nrpe-%{version}.tar.gz
@@ -109,18 +109,24 @@ if [ "$1" = "0" ] ; then
/sbin/chkconfig --del nrpe
fi
-%triggerpostun -- %{name} < 2.15-4
+%triggerpostun -- %{name} < 2.15-5
# skip *this* trigger on downgrade
[ $1 -le 1 ] && exit 0
+# ensure there's include_dir directive
+if ! grep -q '^include_dir=%{_sysconfdir}/nrpe.d' %{_sysconfdir}/nrpe.cfg; then
+ echo 'include_dir=%{_sysconfdir}/nrpe.d' >> %{_sysconfdir}/nrpe.cfg
+fi
+
# check if need to migrate
-grep -q '^command\[' %{_sysconfdir}/nrpe.cfg || exit 0
+grep -q '^command\[' %{_sysconfdir}/nrpe.cfg || exit 0
# move command definitions to separate file
mv -f %{_sysconfdir}/nrpe.d/commands.cfg{,.rpmnew}
grep '^command\[' %{_sysconfdir}/nrpe.cfg > %{_sysconfdir}/nrpe.d/commands.cfg
cp -f %{_sysconfdir}/nrpe.cfg{,.rpmsave}
sed -i -e '/^command\[/d' %{_sysconfdir}/nrpe.cfg
+
%service nrpe restart
%triggerpostun -- %{name} < 2.6-1.1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios-nrpe.git/commitdiff/6102476e64e2f8df9efbb02aa36233142a39f314
More information about the pld-cvs-commit
mailing list