summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2014-10-13 16:47:12 +0200
committerJeremy Kersten <jke@odoo.com>2014-10-13 16:47:12 +0200
commitc8e14f301f2ecdd8ff4ddbf032edddea323a3411 (patch)
treeb1a9bffb98e13197870aff768369487691441c82 /addons
parent66600b93c56127e85c7679537922977c90771b34 (diff)
[FIX] GeoIP - allow to specify the path to GeoIP in the server config.
--geoip_db='the_path' which can be used via openerp.tool.config['geoip_database']
Diffstat (limited to 'addons')
-rw-r--r--addons/website/models/ir_http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index bee78eb1cf3..7da212998c8 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -65,7 +65,7 @@ class ir_http(orm.AbstractModel):
import GeoIP
# updated database can be downloaded on MaxMind website
# http://dev.maxmind.com/geoip/legacy/install/city/
- geofile = config.get('geoip_database', '/usr/share/GeoIP/GeoLiteCity.dat')
+ geofile = config.get('geoip_database')
if os.path.exists(geofile):
self.geo_ip_resolver = GeoIP.open(geofile, GeoIP.GEOIP_STANDARD)
else: