Merge pull request #750 from p-l-/pylint-fixes

Use https for Maxmind & list the URLs in the documentation

doc/install/installation.rst

@@ -224,6 +224,26 @@ command on one machine and create an ``ivre-data`` package containing
 the files under the ``/usr/share/ivre/geoip`` directory (or distribute
 those files somehow).
 
+The URLs downloaded are stored in the configuration. By default, the
+following files are downloaded:
+
+::
+
+   $ python
+   >>> from ivre.config import IPDATA_URLS
+   >>> for fname, url in IPDATA_URLS.items():
+   ...     print("%s: %s" % (fname, url))
+   ...
+   GeoLite2-City.tar.gz: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz
+   GeoLite2-City-CSV.zip: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City-CSV.zip
+   GeoLite2-Country.tar.gz: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz
+   GeoLite2-Country-CSV.zip: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip
+   GeoLite2-ASN.tar.gz: https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz
+   GeoLite2-ASN-CSV.zip: https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN-CSV.zip
+   iso3166.csv: https://dev.maxmind.com/static/csv/codes/iso3166.csv
+   BGP.raw: http://thyme.apnic.net/current/data-raw-table
+
+
 Using Agents
 ------------
 

ivre/config.py

@@ -131,20 +131,21 @@
 
 IPDATA_URLS = {
     'GeoLite2-City.tar.gz':
-    'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz',
+    'https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz',
     'GeoLite2-City-CSV.zip':
-    'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City-CSV.zip',
+    'https://geolite.maxmind.com/download/geoip/database/'
+    'GeoLite2-City-CSV.zip',
     'GeoLite2-Country.tar.gz':
-    'http://geolite.maxmind.com/download/geoip/database/'
+    'https://geolite.maxmind.com/download/geoip/database/'
     'GeoLite2-Country.tar.gz',
     'GeoLite2-Country-CSV.zip':
-    'http://geolite.maxmind.com/download/geoip/database/'
+    'https://geolite.maxmind.com/download/geoip/database/'
     'GeoLite2-Country-CSV.zip',
     'GeoLite2-ASN.tar.gz':
-    'http://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz',
+    'https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz',
     'GeoLite2-ASN-CSV.zip':
-    'http://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN-CSV.zip',
-    'iso3166.csv': 'http://dev.maxmind.com/static/csv/codes/iso3166.csv',
+    'https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN-CSV.zip',
+    'iso3166.csv': 'https://dev.maxmind.com/static/csv/codes/iso3166.csv',
     # This one is not from maxmind -- see http://thyme.apnic.net/
     'BGP.raw': 'http://thyme.apnic.net/current/data-raw-table',
 }

web/static/doc/_sources/install/installation.rst.txt

@@ -224,6 +224,26 @@ command on one machine and create an ``ivre-data`` package containing
 the files under the ``/usr/share/ivre/geoip`` directory (or distribute
 those files somehow).
 
+The URLs downloaded are stored in the configuration. By default, the
+following files are downloaded:
+
+::
+
+   $ python
+   >>> from ivre.config import IPDATA_URLS
+   >>> for fname, url in IPDATA_URLS.items():
+   ...     print("%s: %s" % (fname, url))
+   ...
+   GeoLite2-City.tar.gz: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz
+   GeoLite2-City-CSV.zip: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City-CSV.zip
+   GeoLite2-Country.tar.gz: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz
+   GeoLite2-Country-CSV.zip: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip
+   GeoLite2-ASN.tar.gz: https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz
+   GeoLite2-ASN-CSV.zip: https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN-CSV.zip
+   iso3166.csv: https://dev.maxmind.com/static/csv/codes/iso3166.csv
+   BGP.raw: http://thyme.apnic.net/current/data-raw-table
+
+
 Using Agents
 ------------
 

web/static/doc/install/installation.html

@@ -369,6 +369,23 @@ <h2>Getting IP data<a class="headerlink" href="#getting-ip-data" title="Permalin
 command on one machine and create an <code class="docutils literal notranslate"><span class="pre">ivre-data</span></code> package containing
 the files under the <code class="docutils literal notranslate"><span class="pre">/usr/share/ivre/geoip</span></code> directory (or distribute
 those files somehow).</p>
+<p>The URLs downloaded are stored in the configuration. By default, the
+following files are downloaded:</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>$ python
+&gt;&gt;&gt; from ivre.config import IPDATA_URLS
+&gt;&gt;&gt; for fname, url in IPDATA_URLS.items():
+...     print(&quot;%s: %s&quot; % (fname, url))
+...
+GeoLite2-City.tar.gz: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz
+GeoLite2-City-CSV.zip: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City-CSV.zip
+GeoLite2-Country.tar.gz: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz
+GeoLite2-Country-CSV.zip: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip
+GeoLite2-ASN.tar.gz: https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz
+GeoLite2-ASN-CSV.zip: https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN-CSV.zip
+iso3166.csv: https://dev.maxmind.com/static/csv/codes/iso3166.csv
+BGP.raw: http://thyme.apnic.net/current/data-raw-table
+</pre></div>
+</div>
 </div>
 <div class="section" id="using-agents">
 <h2>Using Agents<a class="headerlink" href="#using-agents" title="Permalink to this headline">¶</a></h2>