2011-10-11 Junichi Satoh <junichi@rworks.jp>

* FreeBSD/pandora_server.conf: Synchronized with the generic
	configuration file, conf/pandora_server.conf.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5059 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_server/ChangeLog

@@ -1,3 +1,8 @@
+2011-10-11  Junichi Satoh <junichi@rworks.jp>
+
+	* FreeBSD/pandora_server.conf: Synchronized with the generic
+	configuration file, conf/pandora_server.conf.
+
 2011-10-10 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* util/plugin/ipmi-plugin.pl: Added first version of ipmi plugin.

pandora_server/FreeBSD/pandora_server.conf

@@ -1,9 +1,9 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 3.1
+# Version 4.0
 # Licensed under GPL license v2,
-# (c) 2003-2010 Artica Soluciones Tecnologicas
+# (c) 2003-2011 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
 # Please change it for your setup needs
 #############################################################################
@@ -216,6 +216,9 @@ snmpget /usr/local/bin/snmpget
 
 snmp_trapd /usr/local/sbin/snmptrapd
 
+# Location of the braa binary needed by the Enterprise SNMP Server (/usr/local/bin/braa by default) (PANDORA FMS ENTERPRISE ONLY).
+braa /usr/local/bin/braa
+
 # Default group id for new agents created with Pandora FMS Data Server
 autocreate_group 2
 
@@ -229,11 +232,11 @@ autocreate 1
 
 max_log_size 65536
 
-# max_queue_files (250 by default)
+# max_queue_files (500 by default)
 # When server have more than max_queue_files in incoming directory, skips the read   
 # the directory to avoid filesystem overhead.
 
-max_queue_files 250
+max_queue_files 500
 
 # Use the XML file last modification time as timestamp.
 # use_xml_timestamp 1
@@ -280,3 +283,58 @@ max_queue_files 250
 
 # Update parent from the agent xml
 #update_parent 1
+#
+#
+# This enable realtime reverse geocoding using Google Maps public api.
+# This requires internet access, and could have performance penalties processing GIS
+# information due the connetion needed to resolve all GIS input.
+# NOTE: If you dont pay the service to google, they will ban your IP in a few days.
+
+# google_maps_description 1
+
+# This enable realtime reverse geocoding using Openstreet Maps public api.
+# This requires internet access, and could have performance penalties processing GIS
+# information due the connetion needed to resolve all GIS input.
+# 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 0
+
+# 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 0
+
+# Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
+snmp_threads 2
+
+# Block size for block producer/consumer servers, that is, the number of modules
+# per block (15 by default) (PANDORA FMS ENTERPRISE ONLY).
+block_size 15