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

2013-11-11 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Config.pm,
	  conf/pandora_server.conf.new: Added support for CURL web checks.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9050 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2013-11-11 15:17:26 +00:00
parent 56448babda
commit 0640418bfc
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2013-11-11 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,
conf/pandora_server.conf.new: Added support for CURL web checks.
2013-11-11 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Change the format of the comments when

3
pandora_server/conf/pandora_server.conf.new
View File

@ -339,6 +339,9 @@ webserver 1
web_threads 1
# Uncomment to perform web checks with CURL instead of LWP.
#web_engine curl
# Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY).
inventoryserver 1

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

@ -223,6 +223,7 @@ sub pandora_load_config {
$pa_config->{"inventory_threads"} = 2; # 2.1
$pa_config->{"export_threads"} = 1; # 3.0
$pa_config->{"web_threads"} = 1; # 3.0
$pa_config->{"web_engine"} = 'lwp'; # 5.1
$pa_config->{"activate_gis"} = 0; # 3.1
$pa_config->{"location_error"} = 50; # 3.1
$pa_config->{"recon_reverse_geolocation_mode"} = 'disabled'; # 3.1
@ -620,6 +621,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^web_threads\s([0-9]*)/i) {
$pa_config->{'web_threads'}= clean_blank($1);
}
elsif ($parametro =~ m/^web_engine\s(.*)/i) {
$pa_config->{'web_engine'}= clean_blank($1);
}
elsif ($parametro =~ m/^snmp_trapd\s(.*)/i) {
$pa_config->{'snmp_trapd'}= clean_blank($1);
}