tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-06-27 Koichiro Kikuchi <koichiro@rworks.jp> 

* pandora_server.redhat.spec: Small fixes: removed duplicated useradd
	 line, don't remove pandora user after uninstall, added collections
	 directory.

	Merged from 4.0 branch.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6719 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
koichirok 2012-06-27 07:02:52 +00:00
parent 9de54ccf84
commit efcd724c94
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,3 +1,11 @@
2012-06-27 Kikuchi Koichiro <koichiro@rworks.jp>
* pandora_server.redhat.spec: Small fixes: removed duplicated useradd
line, don't remove pandora user after uninstall, added collections
directory.
Merged from 4.0 branch.
2012-06-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* lib/PandoraFMS/Core.pm: Added deletion of tags when a module is

12
pandora_server/pandora_server.redhat.spec
View File

@ -19,9 +19,9 @@ Prefix: %{_datadir}
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildArchitectures: noarch
Prereq: /sbin/chkconfig, /sbin/service
Prereq: %{_sbindir}/useradd
AutoReq: 0
Provides: %{name}-%{version}
Requires(pre): shadow-utils
Requires: coreutils
Requires: perl-DBI perl-DBD-mysql perl-libwww-perl
Requires: perl-XML-Simple perl-XML-Twig net-snmp-utils
@ -48,6 +48,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pandora/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/pandora/data_in
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/pandora/data_in/conf
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/pandora/data_in/md5
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/pandora/data_in/collections
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/pandora/
mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_server/conf/
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
@ -87,14 +88,14 @@ chmod 0755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/pandora_db
rm -fr $RPM_BUILD_ROOT
%pre
/usr/sbin/useradd -d %{prefix}/pandora_server -s /bin/false -M -g 0 pandora
getent passwd pandora >/dev/null || \
/usr/sbin/useradd -d %{prefix}/pandora_server -s /sbin/nologin -M -g 0 pandora
if [ -e "/etc/pandora/pandora_server.conf" ]
then
cat /etc/pandora/pandora_server.conf > /etc/pandora/pandora_server.conf.old
fi
id pandora >/dev/null 2>&1 || \
/usr/sbin/useradd -d /var/spool/pandora -s /sbin/nologin -m -g 0 pandora 2> /dev/null
exit 0
%post
@ -126,7 +127,6 @@ fi
/sbin/service tentacle_serverd stop &>/dev/null
/sbin/chkconfig --del pandora_server
/sbin/chkconfig --del tentacle_serverd
userdel pandora
exit 0
@ -138,8 +138,6 @@ exit 0
%{_sysconfdir}/cron.daily/pandora_db
%config(noreplace) %{_sysconfdir}/logrotate.d/pandora_server
%defattr(755,pandora,root)
%{prefix}/pandora_server
/usr/lib/perl5/PandoraFMS