From bf94c6b443562bddf2fc761594e0f32140803f52 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 24 Jan 2012 18:46:00 +0000 Subject: [PATCH] 2012-01-24 Ramon Novoa * 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 --- pandora_server/ChangeLog | 8 ++++++++ pandora_server/DEBIAN/make_deb_package.sh | 2 ++ pandora_server/bin/pandora_server | 8 ++++---- pandora_server/pandora_server.spec | 2 ++ pandora_server/pandora_server_installer | 2 ++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index fa702cb5e0..6ece1bedcb 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,11 @@ +2012-01-24 Ramon Novoa + + * 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 * lib/PandoraFMS/Config.pm, diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 072e3fa549..f0f90cedc7 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -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/ diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index 8ab11eae5b..b033040eeb 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -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); } ######################################################################################## diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index c7b6d4f6aa..c31c071b8e 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -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) diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index f6454171fc..6080c80ba6 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -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"