From 5d94a36d2221119e4fdddb576f09d8bd60117305 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Sun, 22 Nov 2020 15:05:30 +0100 Subject: [PATCH] geoip: use correct download URL for MaxMind DBs The download URL for the GeoLite2 DBs has changed and includes a licence key. Update the download script to read the key from file or stdin and use the correct URL. Signed-off-by: Jeremy Sowden --- geoip/xt_geoip_dl_maxmind | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/geoip/xt_geoip_dl_maxmind b/geoip/xt_geoip_dl_maxmind index 1de6044..d564033 100755 --- a/geoip/xt_geoip_dl_maxmind +++ b/geoip/xt_geoip_dl_maxmind @@ -1,7 +1,16 @@ #!/bin/sh +if [ $# -eq 1 ]; then + exec <$1 +elif [ $# -ne 0 ]; then + echo $(basename $0) [ licence_key_file ] 1>&2 + exit 1 +fi + +read licence_key + rm -rf GeoLite2-Country-CSV_* -wget -q http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip +wget -q -OGeoLite2-Country-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&license_key=${licence_key}&suffix=zip" unzip -q GeoLite2-Country-CSV.zip rm -f GeoLite2-Country-CSV.zip