[tor-commits] [onionoo/master] Document how to fetch geoip files.

[karsten at torproject.org]

commit 6d141b9733673598a448302b6566efb922b52ada
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Sep 17 10:52:47 2014 +0200

    Document how to fetch geoip files.
---
 INSTALL              |   39 +++++++++------------------------------
 vagrant/bootstrap.sh |    2 +-
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/INSTALL b/INSTALL
index 2d73b78..5bc8c62 100644
--- a/INSTALL
+++ b/INSTALL
@@ -46,42 +46,21 @@ Download GeoIP and ASN database files
 Onionoo uses an IP-to-city database and an IP-to-ASN database to provide
 additional information about a relay's location.
 
-The IP-to-city database to be deployed with Onionoo needs to have its "A1"
-("Anonymous Proxy") entries fixed just like Tor's IP-to-country file.  See
-Tor's src/config/README.geoip for detailed information.
-
-First, change to the geoip/ directory:
+First, create the geoip/ directory and change to it:
 
+$ mkdir -p geoip
 $ cd geoip/
 
-Download the most recent MaxMind GeoLite City database and unzip it in the
-current directory, junking paths:
-
-$ wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity-latest.zip
-$ unzip -j GeoLiteCity-latest.zip
-
-Run deanonymind.py in the local directory:
-
-$ python deanonymind.py
-
-Review the output to learn about applied automatic/manual changes and
-watch out for any warnings.  Possibly edit geoip-manual to make
-more/fewer/different manual changes and re-run deanonymind.py.  To look at
-automatic and manual changes, run:
-
-$ diff -U1 GeoLiteCity-Blocks.csv Automatic-GeoLiteCity-Blocks.csv
-$ diff -U1 Automatic-GeoLiteCity-Blocks.csv Manual-GeoLiteCity-Blocks.csv
-
-Download MaxMind's country and region codes files to the current
-directory:
+Download the most recent MaxMind GeoLite2 City database and unzip it in
+the current directory, junking paths:
 
-$ wget http://dev.maxmind.com/static/csv/codes/iso3166.csv
-$ wget http://dev.maxmind.com/static/csv/codes/maxmind/region.csv
+$ wget https://geolite.maxmind.com/download/geoip/database/GeoLite2-City-CSV.zip
+$ unzip -j GeoLite2-City-CSV.zip
 
-Download the most recent MaxMind ASN database file and unzip it in the
-current directory:
+Download the most recent MaxMind GeoLite ASN database file and unzip it in
+the current directory:
 
-$ wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum2.zip
+$ wget https://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum2.zip
 $ unzip GeoIPASNum2.zip
 
 Change back to the root working directory:
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index b3733de..280f08b 100644
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -13,7 +13,7 @@ echo "Installing required packages."
 apt-get install -y openjdk-7-jdk
 apt-get install -y libcommons-codec-java libcommons-compress-java \
 libcommons-lang-java libgoogle-gson-java junit4 libservlet3.0-java \
-ant tomcat6 libslf4j-java liblogback-java
+ant tomcat6 libslf4j-java liblogback-java unzip
 
 echo "Setting up paths and creating symbolic links."
 mkdir -p /srv/onionoo.torproject.org/onionoo/