From 5db15e12d86cad16e4cf7ebe787333c43ca2ef9b Mon Sep 17 00:00:00 2001 From: Luis Date: Thu, 25 Jun 2020 16:34:09 +0200 Subject: [PATCH] Changed default web engine from LWP to CURL --- pandora_server/FreeBSD/pandora_server.conf.new | 4 ++-- pandora_server/NetBSD/pandora_server.conf.new | 4 ++-- pandora_server/conf/pandora_server.conf.new | 4 ++-- pandora_server/conf/pandora_server.conf.windows | 4 ++-- pandora_server/lib/PandoraFMS/Config.pm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pandora_server/FreeBSD/pandora_server.conf.new b/pandora_server/FreeBSD/pandora_server.conf.new index 9f072621ee..c6394319b5 100644 --- a/pandora_server/FreeBSD/pandora_server.conf.new +++ b/pandora_server/FreeBSD/pandora_server.conf.new @@ -384,8 +384,8 @@ webserver 1 web_threads 1 -# Uncomment to perform web checks with CURL instead of LWP. -#web_engine curl +# Uncomment to perform web checks with LWP instead of CURL. +#web_engine lwp # Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY). diff --git a/pandora_server/NetBSD/pandora_server.conf.new b/pandora_server/NetBSD/pandora_server.conf.new index 66743aee36..0921088f65 100644 --- a/pandora_server/NetBSD/pandora_server.conf.new +++ b/pandora_server/NetBSD/pandora_server.conf.new @@ -376,8 +376,8 @@ webserver 1 web_threads 1 -# Uncomment to perform web checks with CURL instead of LWP. -#web_engine curl +# Uncomment to perform web checks with LWP instead of CURL. +#web_engine lwp # Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY). diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index ee2c8ab80e..26fd4029cf 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -433,8 +433,8 @@ web_threads 1 web_timeout 60 -# Uncomment to perform web checks with CURL instead of LWP. -#web_engine curl +# Uncomment to perform web checks with LWP instead of CURL. +#web_engine lwp # Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY). diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows index 44a36abad9..3c890f83eb 100644 --- a/pandora_server/conf/pandora_server.conf.windows +++ b/pandora_server/conf/pandora_server.conf.windows @@ -374,8 +374,8 @@ webserver 1 web_threads 1 -# Uncomment to perform web checks with CURL instead of LWP. -#web_engine curl +# Uncomment to perform web checks with LWP instead of CURL. +#web_engine lwp # Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY). diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index ca4f60a236..9c75d4f0c2 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -297,7 +297,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->{"web_engine"} = 'curl'; # 5.1 $pa_config->{"activate_gis"} = 0; # 3.1 $pa_config->{"location_error"} = 50; # 3.1 $pa_config->{"recon_reverse_geolocation_file"} = ''; # 3.1