commit 6bc339ce8ef7b6f701a2ab6c560b3728a9a4bdde Merge: da91932 add9474 Author: Arturo Filastò art@fuffa.org Date: Thu Nov 13 12:26:49 2014 +0100

Merge branch 'fix/ooniresources' into feature/fix_setup.py

* fix/ooniresources: By default read the datadirectory from a ini file Set ooni systemwide config to /etc/ooni/ooniprobe.conf Leave GeoIP data in /usr/share/GeoIP Add GeoLiteCity dataset to ooniresources Remove comment Check for system-config globally, use /var/lib/ooni Display correct download path Update MaxMind URL Set user's logfile Set system-wide defaults for logfile, use /var/lib/ooni instead of /usr/share/ooni Check for system-wide configuration Use HTTPS URLs for MaxMind resources

data/ooniprobe.conf.sample | 4 ++-- ooni/resources/__init__.py | 13 +++++++++++-- ooni/resources/update.py | 7 ++++++- ooni/settings.ini | 3 +++ ooni/settings.py | 37 +++++++++++++++++-------------------- ooni/utils/__init__.py | 7 ++++++- 6 files changed, 45 insertions(+), 26 deletions(-)