hvad pushed to shinken (epel7). "path.cfg file"

[notifications at fedoraproject.org]

From 536a9d61d8547ca27830e092f59426f8f02c8aa7 Mon Sep 17 00:00:00 2001
From: hvad <david.hannequin at gmail.com>
Date: Sat, 14 Feb 2015 14:41:09 +0100
Subject: fix pollerd user


diff --git a/shinken.spec b/shinken.spec
index 81493b0..9afe373 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -5,7 +5,7 @@
 Summary:        Python Monitoring tool
 Name:           shinken
 Version:        2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.%{name}-monitoring.org
 Source0:        https://github.com/naparuba/%{name}/archive/%{version}.tar.gz 
 Source1:        %{name}-arbiter.service
@@ -252,10 +252,8 @@ sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/it
 sed -i 's|shinken_user=shinken|shinken_user=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/%{name}.cfg
 sed -i 's|shinken_group=shinken|shinken_group=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/%{name}.cfg
 
-sed -i 's|#user=shinken|user=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/{brokerd,reactionnerd,receiverd,schedulerd}.ini
-sed -i 's|#group=shinken|group=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/{brokerd,reactionnerd,receiverd,schedulerd}.ini
-sed -i 's|# user=shinken|user=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/pollerd.ini
-sed -i 's|# group=shinken|group=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/pollerd.ini
+sed -i 's|#user=shinken|user=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/{brokerd,pollerd,reactionnerd,receiverd,schedulerd}.ini
+sed -i 's|#group=shinken|group=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/{brokerd,pollerd,reactionnerd,receiverd,schedulerd}.ini
 
 rm -rf %{buildroot}%{_localstatedir}/lib/%{name}/inventory/__void_for_git
 rm -rf %{buildroot}%{_localstatedir}/{log,run,lib}/%{name}/void_for_git
@@ -547,6 +545,9 @@ fi
 %attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Fri Mar 27 2015 David Hannequin <david.hannequin at gmail.com> - 2.2-3
+- Fix bad daemon configuration file.
+
 * Sun Jan 18 2015 David Hannequin <david.hannequin at gmail.com> - 2.2-2
 - Fix Bug 1197485 (thanks Jorge Martínez López).
 
-- 
cgit v0.10.2


From 882d898c0ff64b47fa3774e4ec22e10b64f06ca3 Mon Sep 17 00:00:00 2001
From: hvad <david.hannequin at gmail.com>
Date: Sat, 14 Feb 2015 16:58:52 +0100
Subject: path.cfg file


diff --git a/path.cfg b/path.cfg
index dc369ce..27b7f6d 100644
--- a/path.cfg
+++ b/path.cfg
@@ -1 +1,5 @@
+# Plugin path for X86_64
 $PLUGINSDIR$=/usr/lib64/nagios/plugins
+
+# Change plugin path if you need : 
+#$PLUGINSDIR$=/usr/lib/nagios/plugins
diff --git a/shinken.spec b/shinken.spec
index 9afe373..baa4364 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -5,7 +5,7 @@
 Summary:        Python Monitoring tool
 Name:           shinken
 Version:        2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://www.%{name}-monitoring.org
 Source0:        https://github.com/naparuba/%{name}/archive/%{version}.tar.gz 
 Source1:        %{name}-arbiter.service
@@ -21,6 +21,7 @@ Source10:       %{name}-scheduler.init
 Source11:       %{name}-receiver.init
 Source12:       %{name}-poller.init
 Source13:       %{name}.8shinken
+Source14:       path.cfg
 License:        AGPLv3+
 Requires:       python-simplejson 
 Requires:       python-pycurl  
@@ -148,7 +149,7 @@ install -p -m0644 for_fedora/etc/objects/contacts/nagiosadmin.cfg %{buildroot}%{
 install -p -m0644 for_fedora/etc/objects/hosts/localhost.cfg %{buildroot}%{_sysconfdir}/%{name}/hosts/localhost.cfg
 install -p -m0644 for_fedora/etc/objects/services/linux_disks.cfg %{buildroot}%{_sysconfdir}/%{name}/services/linux_disks.cfg
 install -p -m0644 for_fedora/etc/contactgroups.cfg %{buildroot}%{_sysconfdir}/%{name}/contactgroups/contactgroups.cfg
-echo '$PLUGINSDIR$=%{_libdir}/nagios/plugins' > %{buildroot}%{_sysconfdir}/%{name}/resource.d/path.cfg
+install -p -m0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/%{name}/resource.d/path.cfg
 
 
 %if %{with_systemd}
@@ -545,6 +546,9 @@ fi
 %attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Thu May 7 2015 David Hannequin <david.hannequin at gmail.com> - 2.2-4
+- Add path.cfg file
+
 * Fri Mar 27 2015 David Hannequin <david.hannequin at gmail.com> - 2.2-3
 - Fix bad daemon configuration file.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/shinken.git/commit/?h=epel7&id=2f141965b4061f3fe00dba9fdce50786303bfbab