summaryrefslogtreecommitdiff
path: root/odoo/tools
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-04-16 12:33:49 +0200
committerChristophe Simonis <chs@odoo.com>2018-04-16 12:33:49 +0200
commitaab0908818ab4bee0af136d4e693a90ab1b2d261 (patch)
tree6e70a833e43c139f010c019cb2a774baa38379fe /odoo/tools
parent412501a5dc8f8826f10eac0c19adfa82527ad4bb (diff)
parentc92d43c04b7025440a9919a2ab37b0d714c53d24 (diff)
[MERGE] forward port branch 10.0 up to c92d43c04b7
Diffstat (limited to 'odoo/tools')
-rw-r--r--odoo/tools/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/tools/config.py b/odoo/tools/config.py
index 5056ae77880..2bf198cc585 100644
--- a/odoo/tools/config.py
+++ b/odoo/tools/config.py
@@ -255,7 +255,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/GeoLiteCity.dat',
+ group.add_option("--geoip-db", dest="geoip_database", my_default='/usr/share/GeoIP/GeoLite2-City.mmdb',
help="Absolute path to the GeoIP database file.")
parser.add_option_group(group)