Faidon Liambotis has submitted this change and it was merged.
Change subject: geoip: add support for GeoLite2
......................................................................
geoip: add support for GeoLite2
Change-Id: Ibb8c175002cf9c48d8e4467505e70d5df5b6becc
---
M modules/geoip/files/geoliteupdate
M modules/puppet/manifests/self/geoip.pp
M modules/puppetmaster/manifests/geoip.pp
3 files changed, 25 insertions(+), 25 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/geoip/files/geoliteupdate
b/modules/geoip/files/geoliteupdate
index 470f136..a5e1792 100644
--- a/modules/geoip/files/geoliteupdate
+++ b/modules/geoip/files/geoliteupdate
@@ -16,35 +16,19 @@
exit 1
fi
-GEOIP_URL="http://geolite.maxmind.com/download/geoip/database/";
-
-GEOLITE_COUNTRY_PATH="GeoLiteCountry/"
-GEOLITE_COUNTRY_FILE="GeoIP.dat.gz"
-
-GEOLITE_COUNTRY_IPV6_PATH=""
-GEOLITE_COUNTRY_IPV6_FILE="GeoIPv6.dat.gz"
-
-GEOLITE_CITY_PATH=""
-GEOLITE_CITY_FILE="GeoLiteCity.dat.gz"
-
-GEOLITE_CITY_IPV6_PATH="GeoLiteCityv6-beta/"
-GEOLITE_CITY_IPV6_FILE="GeoLiteCityv6.dat.gz"
-
-GEOLITE_ASNUM_PATH="asnum/"
-GEOLITE_ASNUM_FILE="GeoIPASNum.dat.gz"
-
-GEOLITE_ASNUM_IPV6_PATH="asnum/"
-GEOLITE_ASNUM_IPV6_FILE="GeoIPASNumv6.dat.gz"
+GEOIP_URL="http://geolite.maxmind.com/download/geoip/database";
FAILED=0
for url in \
- "$GEOIP_URL$GEOLITE_COUNTRY_PATH$GEOLITE_COUNTRY_FILE" \
- "$GEOIP_URL$GEOLITE_COUNTRY_IPV6_PATH$GEOLITE_COUNTRY_IPV6_FILE" \
- "$GEOIP_URL$GEOLITE_CITY_PATH$GEOLITE_CITY_FILE" \
- "$GEOIP_URL$GEOLITE_CITY_IPV6_PATH$GEOLITE_CITY_IPV6_FILE" \
- "$GEOIP_URL$GEOLITE_ASNUM_PATH$GEOLITE_ASNUM_FILE" \
- "$GEOIP_URL$GEOLITE_ASNUM_IPV6_PATH$GEOLITE_ASNUM_IPV6_FILE"
+ "$GEOIP_URL/GeoLiteCountry/GeoIP.dat.gz" \
+ "$GEOIP_URL/GeoIPv6.dat.gz" \
+ "$GEOIP_URL/GeoLiteCity.dat.gz" \
+ "$GEOIP_URL/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" \
+ "$GEOIP_URL/asnum/GeoIPASNum.dat.gz" \
+ "$GEOIP_URL/asnum/GeoIPASNumv6.dat.gz" \
+ "$GEOIP_URL/GeoLite2-Country" \
+ "$GEOIP_URL/GeoLite2-City.mmdb.gz"
do
echo "Downloading: $url"
diff --git a/modules/puppet/manifests/self/geoip.pp
b/modules/puppet/manifests/self/geoip.pp
index dd799a0..476ed5a 100644
--- a/modules/puppet/manifests/self/geoip.pp
+++ b/modules/puppet/manifests/self/geoip.pp
@@ -25,5 +25,13 @@
ensure => link,
target => 'GeoLiteCity.dat',
}
+ file { "$geoip_destdir/GeoIP2-Country.mmdb":
+ ensure => link,
+ target => 'GeoLite2-Country.mmdb',
+ }
+ file { "$geoip_destdir/GeoIP2-City.mmdb":
+ ensure => link,
+ target => 'GeoLite2-City.mmdb',
+ }
}
diff --git a/modules/puppetmaster/manifests/geoip.pp
b/modules/puppetmaster/manifests/geoip.pp
index 69e5db0..61ec6c9 100644
--- a/modules/puppetmaster/manifests/geoip.pp
+++ b/modules/puppetmaster/manifests/geoip.pp
@@ -28,6 +28,14 @@
ensure => link,
target => 'GeoLiteCity.dat',
}
+ file { "$geoip_destdir/GeoIP2-Country.mmdb":
+ ensure => link,
+ target => 'GeoLite2-Country.mmdb',
+ }
+ file { "$geoip_destdir/GeoIP2-City.mmdb":
+ ensure => link,
+ target => 'GeoLite2-City.mmdb',
+ }
} else {
# Fetch the proprietary paid-for MaxMind database
include passwords::geoip
--
To view, visit https://gerrit.wikimedia.org/r/172455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb8c175002cf9c48d8e4467505e70d5df5b6becc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
