From 7ad2b57efa35784146f4a262671b9c984d17c5bf Mon Sep 17 00:00:00 2001 From: uchida Date: Sat, 14 Jun 2014 14:09:49 +0000 Subject: [PATCH] 2014-06-14 Akihiro Uchida * pandora_server/pandora_server.redhat.spec: allow tty-less sudo for pandora to fix failure on start tentacle_serverd service in recent RHEL derivatives. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10192 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/pandora_server.redhat.spec | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index ddbbca1d30..29159a2f37 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2014-06-14 Akihiro Uchida + + * pandora_server/pandora_server.redhat.spec: allow + tty-less sudo for pandora to fix failure on start + tentacle_serverd service in recent RHEL derivatives. + 2014-06-12 Ramon Novoa * lib/PandoraFMS/Core.pm: Removed the keepalive semaphore, since down_force diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index f9e81dba69..a386c5def4 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -79,6 +79,13 @@ rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/recon_scripts/PandoraFMS install -m 0644 util/pandora_logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pandora_server install -m 0640 conf/pandora_server.conf.new $RPM_BUILD_ROOT%{_sysconfdir}/pandora/pandora_server.conf.new +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d +chmod 0750 $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d +cat < $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d/pandora +Defaults:pandora !requiretty +EOF +chmod 0440 $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d/pandora + cat < $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/pandora_db #!/bin/bash %__perl %{prefix}/pandora_server/util/pandora_db.pl %{_sysconfdir}/pandora/pandora_server.conf @@ -144,6 +151,7 @@ exit 0 %{_sysconfdir}/rc.d/init.d/pandora_server %{_sysconfdir}/rc.d/init.d/tentacle_serverd %{_sysconfdir}/cron.hourly/pandora_db +%config(noreplace) %{_sysconfdir}/sudoers.d/pandora %config(noreplace) %{_sysconfdir}/logrotate.d/pandora_server %defattr(755,pandora,root)