[tor-commits] [ooni-probe/master] Install the geoip data files to a different directory

[art at torproject.org]

commit f0edbbd8e0a2af12b51c24de5d4455deec174623
Author: Arturo Filastò <art at fuffa.org>
Date:   Sun Jan 12 18:40:12 2014 +0100

    Install the geoip data files to a different directory
---
 data/ooniprobe.conf.sample |    2 +-
 setup.py                   |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample
index 6fa7caf..4ce1e19 100644
--- a/data/ooniprobe.conf.sample
+++ b/data/ooniprobe.conf.sample
@@ -21,7 +21,7 @@ reports:
     pcap: null
     collector: 'httpo://nkvphnp3p6agi5qq.onion'
 advanced:
-    geoip_data_dir: /usr/share/GeoIP
+    geoip_data_dir: /usr/share/ooni/geoip
     debug: false
     # enable if auto detection fails
     #tor_binary: /usr/sbin/tor
diff --git a/setup.py b/setup.py
index 5f97f42..0082365 100644
--- a/setup.py
+++ b/setup.py
@@ -68,14 +68,13 @@ if hasattr(sys, 'real_prefix'):
     )]
 else:
     data_files = [(
-        '/usr/share/GeoIP/', 
+        '/usr/share/ooni/geoip/', 
         [
+            'data/GeoIP.dat',
             'data/GeoIPASNum.dat',
             'data/GeoLiteCity.dat'
         ]
     )]
-    if not os.path.exists('/usr/share/GeoIP/GeoIP.dat'):
-        data_files[0][1].append('data/GeoIP.dat')
 
 for root, dirs, file_names in os.walk('data/'):
     files = []