From fffaf406175c136e55a77a07ae01d86a4154feb0 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 18 May 2015 11:42:20 +0200 Subject: [PATCH] [FIX] website: geoip restore city file location And change the warning message with instruction on how to install the database, debian geoip-database-contrib has a script to easily install it. --- addons/website/models/ir_http.py | 2 +- openerp/tools/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index a0b9e7bf714..f1d60c2f100 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -78,7 +78,7 @@ class ir_http(orm.AbstractModel): self._geoip_resolver = GeoIP.open(geofile, GeoIP.GEOIP_STANDARD) else: self._geoip_resolver = False - logger.warning('GeoIP database file %r does not exists', geofile) + logger.warning('GeoIP database file %r does not exists, apt-get install geoip-database-contrib or download it from http://dev.maxmind.com/geoip/legacy/install/city/', geofile) except ImportError: self._geoip_resolver = False diff --git a/openerp/tools/config.py b/openerp/tools/config.py index d11956d8124..027ef49ffa2 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -270,7 +270,7 @@ class configmanager(object): type="int") group.add_option("--unaccent", dest="unaccent", my_default=False, action="store_true", help="Use the unaccent function provided by the database when available.") - group.add_option("--geoip-db", dest="geoip_database", my_default='/usr/share/GeoIP/GeoIP.dat', + group.add_option("--geoip-db", dest="geoip_database", my_default='/usr/share/GeoIP/GeoLiteCity.dat', help="Absolute path to the GeoIP database file.") parser.add_option_group(group)