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

2012-01-24 Ramon Novoa <rnovoa@artica.es> 

* DEBIAN/make_deb_package.sh,
	  pandora_server_installer,
	  pandora_server.spec: Auto-create the netflow storage dir.

	* bin/pandora_server: Aesthetic changes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5418 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2012-01-24 18:46:00 +00:00
parent 4ed9ea98c4
commit bf94c6b443
5 changed files with 18 additions and 4 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-01-24 Ramon Novoa <rnovoa@artica.es>
* DEBIAN/make_deb_package.sh,
pandora_server_installer,
pandora_server.spec: Auto-create the netflow storage dir.
* bin/pandora_server: Aesthetic changes.
2012-01-24 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -76,6 +76,8 @@ then
chmod 770 temp_package/var/spool/pandora/data_in/md5
mkdir -p temp_package/var/spool/pandora/data_in/collections
chmod 770 temp_package/var/spool/pandora/data_in/collections
mkdir -p temp_package/var/spool/pandora/data_in/netflow
chmod 770 temp_package/var/spool/pandora/data_in/netflow
mkdir -p temp_package/var/log/pandora/
mkdir -p temp_package/usr/share/pandora_server/conf/
mkdir -p temp_package/usr/lib/perl5/

8
pandora_server/bin/pandora_server
View File

@ -186,8 +186,8 @@ sub pandora_start_netflow_daemon () {
# Check if netflow is enabled
if ($Config{'activate_netflow'} != 1) {
logger (\%Config, "Netflow daemon disabled.", 1);
print_message (\%Config, "Netflow daemon disabled.", 1);
logger (\%Config, "[*] Netflow daemon disabled.", 1);
print_message (\%Config, "[*] Netflow daemon disabled.", 1);
return;
}
@ -206,8 +206,8 @@ sub pandora_start_netflow_daemon () {
return;
}
logger (\%Config, "Netflow daemon started.", 1);
print_message (\%Config, "Netflow daemon started.", 1);
logger (\%Config, "[*] Netflow daemon started.", 1);
print_message (\%Config, "[*] Netflow daemon started.", 1);
}
########################################################################################

2
pandora_server/pandora_server.spec
View File

@ -58,6 +58,7 @@ mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in
mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in/conf
mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in/md5
mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in/collections
mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in/netflow
mkdir -p $RPM_BUILD_ROOT/var/log/pandora/
mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_server/conf/
mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/
@ -174,6 +175,7 @@ rm -Rf /usr/share/man/man1/tentacle_server.1.gz
/var/spool/pandora/data_in
/var/spool/pandora/data_in/md5
/var/spool/pandora/data_in/collections
/var/spool/pandora/data_in/netflow
/var/spool/pandora/data_in/conf
%defattr(750,pandora,root)

2
pandora_server/pandora_server_installer
View File

@ -216,6 +216,8 @@ perl-TimeDate perl-XML-Simple perl-XML-Twig perl-libwww-perl mysql-client perl-S
chmod 770 $PANDORA_SPOOL/data_in/md5
mkdir $PANDORA_SPOOL/data_in/collections 2> /dev/null
chmod 770 $PANDORA_SPOOL/data_in/collections
mkdir $PANDORA_SPOOL/data_in/netflow 2> /dev/null
chmod 770 $PANDORA_SPOOL/data_in/netflow
mkdir $PANDORA_LOG 2> /dev/null
echo "Giving proper permission to /var/spool/pandora"