tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1601-WUX_bloquea_el_inicio' into 'develop'

Browse Source 
fixed error server WUX

See merge request artica/pandorafms!1146
This commit is contained in:
vgilc 2018-01-29 13:34:03 +01:00
commit 2ef8a4905f
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -577,6 +577,9 @@ wuxserver 0
# Port of the Selenium Grid Server. # Port of the Selenium Grid Server.
#wux_port 4444 #wux_port 4444
# Maximum timeout to connect to a target web site, also for communications with a Selenium Grid server.
#wux_webagent_timeout 15
# Enable (1) or disable (0) the Pandora FMS Syslog Server (PANDORA FMS ENTERPRISE ONLY). # Enable (1) or disable (0) the Pandora FMS Syslog Server (PANDORA FMS ENTERPRISE ONLY).
syslogserver 1 syslogserver 1

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

@ -453,6 +453,7 @@ sub pandora_load_config {
$pa_config->{"wux_host"} = undef; # 7.0 $pa_config->{"wux_host"} = undef; # 7.0
$pa_config->{"wux_port"} = 4444; # 7.0 $pa_config->{"wux_port"} = 4444; # 7.0
$pa_config->{"wux_browser"} = "*firefox"; # 7.0 $pa_config->{"wux_browser"} = "*firefox"; # 7.0
$pa_config->{"wux_webagent_timeout"} = 15; # 7.0
# Syslog Server # Syslog Server
$pa_config->{"syslogserver"} = 1; # 7.0.716 $pa_config->{"syslogserver"} = 1; # 7.0.716
@ -1068,6 +1069,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^wux_browser\s+(.*)/i) { elsif ($parametro =~ m/^wux_browser\s+(.*)/i) {
$pa_config->{'wux_browser'}= clean_blank($1); $pa_config->{'wux_browser'}= clean_blank($1);
} }
elsif ($parametro =~ m/^wux_webagent_timeout\s+([0-9]*)/i) {
$pa_config->{'wux_webagent_timeout'}= clean_blank($1);
}
elsif ($parametro =~ m/^syslogserver\s+([0-1])/i) { elsif ($parametro =~ m/^syslogserver\s+([0-1])/i) {
$pa_config->{'syslogserver'}= clean_blank($1); $pa_config->{'syslogserver'}= clean_blank($1);
} }