hvad pushed to shinken (el6). "fix pollerd user"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Mar 28 16:38:17 UTC 2015


>From c99b1afd592683fcd0465d635c2d5cb6d0260e96 Mon Sep 17 00:00:00 2001
From: hvad <david.hannequin at gmail.com>
Date: Sat, 14 Feb 2015 15:24:10 +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


	http://pkgs.fedoraproject.org/cgit/shinken.git/commit/?h=el6&id=c99b1afd592683fcd0465d635c2d5cb6d0260e96


More information about the scm-commits mailing list