From 219988018fb6db2c4790caad56217a4858948b4c Mon Sep 17 00:00:00 2001 From: fermin831 Date: Thu, 5 Jul 2018 15:19:13 +0200 Subject: [PATCH] [GeoIP] Modified server conf file to remove recon_reverse_geolocation_mode --- pandora_server/FreeBSD/pandora_server.conf.new | 11 +---------- pandora_server/NetBSD/pandora_server.conf.new | 11 +---------- pandora_server/conf/pandora_server.conf.new | 11 +---------- pandora_server/conf/pandora_server.conf.windows | 11 +---------- pandora_server/lib/PandoraFMS/Config.pm | 4 ---- pandora_server/util/gis.README | 3 --- 6 files changed, 4 insertions(+), 47 deletions(-) diff --git a/pandora_server/FreeBSD/pandora_server.conf.new b/pandora_server/FreeBSD/pandora_server.conf.new index af51a7ce6b..93d9abbc75 100644 --- a/pandora_server/FreeBSD/pandora_server.conf.new +++ b/pandora_server/FreeBSD/pandora_server.conf.new @@ -330,18 +330,9 @@ restart_delay 60 #location_error 50 -# Recon reverse geolocation mode [disabled, sql, file] -# disabled The recon task doesn't try to geolocate the ip discovered. -# sql The recon task trys to query the SQL database to geolocate the -# ip discovered -# file The recon task trys to find the geolocation information of the -# ip discovered in the file indicated in the -# recon_reverse_geolocation_file parameter - -# recon_reverse_geolocation_mode disabled - # Recon reverse geolocation file. This is the database with the reverse # geolocation information using MaxMind GPL GeoLiteCity.dat format). +# Comment it to disable the IP geolocation on agent creation. #recon_reverse_geolocation_file /usr/local/share/GeoIP/GeoIPCity.dat diff --git a/pandora_server/NetBSD/pandora_server.conf.new b/pandora_server/NetBSD/pandora_server.conf.new index ac0db6f2b1..5f38a678da 100644 --- a/pandora_server/NetBSD/pandora_server.conf.new +++ b/pandora_server/NetBSD/pandora_server.conf.new @@ -325,18 +325,9 @@ restart_delay 60 #location_error 50 -# Recon reverse geolocation mode [disabled, sql, file] -# disabled The recon task doesn't try to geolocate the ip discovered. -# sql The recon task trys to query the SQL database to geolocate the -# ip discovered -# file The recon task trys to find the geolocation information of the -# ip discovered in the file indicated in the -# recon_reverse_geolocation_file parameter - -# recon_reverse_geolocation_mode disabled - # Recon reverse geolocation file. This is the database with the reverse # geolocation information using MaxMind GPL GeoLiteCity.dat format). +# Comment it to disable the IP geolocation on agent creation. #recon_reverse_geolocation_file /usr/local/share/GeoIP/GeoIPCity.dat diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 9d0bc569e2..ee1b5491dc 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -342,18 +342,9 @@ restart_delay 60 #location_error 50 -# Recon reverse geolocation mode [disabled, sql, file] -# disabled The recon task doesn't try to geolocate the ip discovered. -# sql The recon task trys to query the SQL database to geolocate the -# ip discovered -# file The recon task trys to find the geolocation information of the -# ip discovered in the file indicated in the -# recon_reverse_geolocation_file parameter - -# recon_reverse_geolocation_mode disabled - # Recon reverse geolocation file. This is the database with the reverse # geolocation information using MaxMind GPL GeoLiteCity.dat format). +# Comment it to disable the IP geolocation on agent creation. #recon_reverse_geolocation_file /usr/local/share/GeoIP/GeoIPCity.dat diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows index a1429970b1..c78fbc86c7 100644 --- a/pandora_server/conf/pandora_server.conf.windows +++ b/pandora_server/conf/pandora_server.conf.windows @@ -301,18 +301,9 @@ restart_delay 60 #location_error 50 -# Recon reverse geolocation mode [disabled, sql, file] -# disabled The recon task doesn't try to geolocate the ip discovered. -# sql The recon task trys to query the SQL database to geolocate the -# ip discovered -# file The recon task trys to find the geolocation information of the -# ip discovered in the file indicated in the -# recon_reverse_geolocation_file parameter - -# recon_reverse_geolocation_mode disabled - # Recon reverse geolocation file. This is the database with the reverse # geolocation information using MaxMind GPL GeoLiteCity.dat format). +# Comment it to disable the IP geolocation on agent creation. #recon_reverse_geolocation_file /usr/local/share/GeoIP/GeoIPCity.dat diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index c271ade075..d4767a1447 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -266,7 +266,6 @@ sub pandora_load_config { $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 $pa_config->{"recon_reverse_geolocation_file"} = ''; # 3.1 $pa_config->{"recon_location_scatter_radius"} = 50; # 3.1 $pa_config->{"update_parent"} = 0; # 3.1 @@ -863,9 +862,6 @@ sub pandora_load_config { } elsif ($parametro =~ m/^location_error\s+(\d+)/i) { $pa_config->{'location_error'} = clean_blank($1); - } - elsif ($parametro =~ m/^recon_reverse_geolocation_mode\s+(\w+)/i) { - $pa_config->{'recon_reverse_geolocation_mode'} = clean_blank($1); } #FIXME: Find a better regexp to validate the path elsif ($parametro =~ m/^recon_reverse_geolocation_file\s+(.*)/i) { $pa_config->{'recon_reverse_geolocation_file'} = clean_blank($1); diff --git a/pandora_server/util/gis.README b/pandora_server/util/gis.README index 500e768524..1d8a85c632 100644 --- a/pandora_server/util/gis.README +++ b/pandora_server/util/gis.README @@ -5,8 +5,6 @@ In order to be able to use GeoIP/GIS features of the Pandora FMS reconserver, yo http://www.maxmind.com/app/geoip_resources http://www.maxmind.com/app/installation http://www.maxmind.com/app/geolitecity - -Install manually Geo-IP-PurePerl-1.24.tar.gz This database will be used with Pandora FMS recon server for positioning detected host Systems. Check Pandora FMS documentacion for more information. @@ -15,7 +13,6 @@ Prior to use this database you need to decompress it with gzip -d and edit your activate_gis 1 recon_reverse_geolocation_file /usr/share/pandora_server/util/GeoLiteCity.dat location_error 50 - recon_reverse_geolocation_mode file recon_location_scatter_radius 1000 Get a new version at: