From 617a992b9ffb2ec753f2fad271071addfcfc6365 Mon Sep 17 00:00:00 2001 From: ramonn Date: Fri, 12 Aug 2011 09:30:28 +0000 Subject: [PATCH] 2011-08-12 Ramon Novoa * conf/pandora_server.conf: Added enterprise configuration tokens to the default conf. * lib/PandoraFMS/Config.pm: Changed the default location of the braa binary. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4726 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 8 +++++ pandora_server/conf/pandora_server.conf | 43 +++++++++++++++++++++++++ pandora_server/lib/PandoraFMS/Config.pm | 2 +- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index fa9b716eb6..dc47d90872 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,11 @@ +2011-08-12 Ramon Novoa + + * conf/pandora_server.conf: Added enterprise configuration tokens to + the default conf. + + * lib/PandoraFMS/Config.pm: Changed the default location of the braa + binary. + 2011-08-10 Ramon Novoa * lib/PandoraFMS/DataServer.pm: Added support for custom module tags diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf index 3ea34e51b9..a702f4e876 100755 --- a/pandora_server/conf/pandora_server.conf +++ b/pandora_server/conf/pandora_server.conf @@ -211,6 +211,9 @@ nmap /usr/bin/nmap snmpget /usr/bin/snmpget +# Location of the braa binary needed by the Enterprise ICMP Server (/usr/bin/braa by default) (PANDORA FMS ENTERPRISE ONLY). +braa /usr/bin/braa + # Default group id for new agents created with Pandora FMS Data Server autocreate_group 2 @@ -290,3 +293,43 @@ max_queue_files 500 # You can alter the code to use a local (your own) openstreet maps server. # openstreetmaps_description 1 + +# Enable (1) or disable (0) Pandora FMS Event Web Server (PANDORA FMS ENTERPRISE ONLY). +webserver 1 + +# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY). +web_threads 2 + +# Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY). +inventoryserver 1 + +# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY). +inventory_threads 2 + +# Enable (1) or disable (0) Pandora FMS Export Server (PANDORA FMS ENTERPRISE ONLY). +exportserver 1 + +# Number of threads for the Export Server (PANDORA FMS ENTERPRISE ONLY). +export_threads 1 + +# Enable (1) or disable (0) Pandora FMS Event Server (PANDORA FMS ENTERPRISE ONLY). +eventserver 1 + +# Event Server event window in seconds (3600 by default) (PANDORA FMS ENTERPRISE ONLY). +event_window 3600 + +# Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY). +icmpserver 1 + +# Number of threads for the Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY). +icmp_threads 2 + +# Enable (1) or disable (0) Pandora FMS Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY). +snmpserver 1 + +# Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY). +snmp_threads 2 + +# Block size for block producer/consumer servers, that is, number of modules per +# block (15 by default) (PANDORA FMS ENTERPRISE ONLY). +block_size 15 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 3a39c0ec44..916e0e2c73 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -256,7 +256,7 @@ sub pandora_load_config { $pa_config->{"nmap"} = "/usr/bin/nmap"; # braa for enterprise snmp server - $pa_config->{"braa"} = "/usr/local/bin/braa"; + $pa_config->{"braa"} = "/usr/bin/braa"; # Xprobe2 for recon OS fingerprinting and tcpscan (optional) $pa_config->{"xprobe2"} = "/usr/bin/xprobe2";