From 28b1d7bd8b2eadb0f61953c01b6c8b0cb6d3c0f5 Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Tue, 12 Feb 2013 16:38:01 +0000
Subject: [PATCH] 2013-02-12  Sancho Lerena <slerena@artica.es>

        * conf/pandora_server.conf: review of all file and removed
        some bad parameters (netflow daemon and other values).




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7635 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_server/ChangeLog                |  5 +++++
 pandora_server/conf/pandora_server.conf | 15 +--------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 93bdeeba2a..c86591957a 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-12  Sancho Lerena <slerena@artica.es>
+
+	* conf/pandora_server.conf: review of all file and removed
+	some bad parameters (netflow daemon and other values).
+
 2013-02-12  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/Core.pm: Fixed the verbosity of the "Processing
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index 4524b1df57..da0425f080 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -380,20 +380,7 @@ block_size 15
 # Enable (1) or disable (0) Pandora FMS Netflow Server.
 # You need to install package nfcapd before try to use this feature.
 
-netflowserver 0
-
-# Path to the netflow daemon nfcapd. Check your local path, depending on OS could be on
-# different path.
-
-netflow_daemon /usr/sbin/nfcapd
-
-# Netflow file rotation interval in seconds.
-
-netflow_interval 300
-
-# Base directory where netflow files will be stored.
-
-netflow_basedir /tmp
+netflowserver 1
 
 # If set to 1, process XML data files in a stack instead of a queue. 0 by default.
 # WARNING: Incremental modules will not work properly if dataserver_lifo is set to 1!!!