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

2011-08-12 Ramon Novoa <rnovoa@artica.es> 

* 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
This commit is contained in:
Ramon Novoa 2011-08-12 09:30:28 +00:00
parent 7729498b67
commit 54d4c07a55
3 changed files with 52 additions and 1 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 @@
2011-08-12 Ramon Novoa <rnovoa@artica.es>
* 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 <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Added support for custom module tags

43
pandora_server/conf/pandora_server.conf
View File

@ -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

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -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";