2014-06-14 Akihiro Uchida <auchida@rworks.jp>

* 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
This commit is contained in:
uchida 2014-06-14 14:09:49 +00:00
parent 35d7736716
commit fc761df914
2 changed files with 14 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2014-06-14 Akihiro Uchida <auchida@rworks.jp>
* 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 <rnovoa@artica.es> 2014-06-12 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Removed the keepalive semaphore, since down_force * lib/PandoraFMS/Core.pm: Removed the keepalive semaphore, since down_force

View File

@ -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 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 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 <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d/pandora
Defaults:pandora !requiretty
EOF
chmod 0440 $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d/pandora
cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/pandora_db cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/pandora_db
#!/bin/bash #!/bin/bash
%__perl %{prefix}/pandora_server/util/pandora_db.pl %{_sysconfdir}/pandora/pandora_server.conf %__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/pandora_server
%{_sysconfdir}/rc.d/init.d/tentacle_serverd %{_sysconfdir}/rc.d/init.d/tentacle_serverd
%{_sysconfdir}/cron.hourly/pandora_db %{_sysconfdir}/cron.hourly/pandora_db
%config(noreplace) %{_sysconfdir}/sudoers.d/pandora
%config(noreplace) %{_sysconfdir}/logrotate.d/pandora_server %config(noreplace) %{_sysconfdir}/logrotate.d/pandora_server
%defattr(755,pandora,root) %defattr(755,pandora,root)