Faidon Liambotis has submitted this change and it was merged.
Change subject: Switch to the GeoIP City databases & add US states
......................................................................
Switch to the GeoIP City databases & add US states
Now that the GeoIP City databases are available, switch to using them
instead. The freely-available/lite IPv6 database is poor and essentially
has no city/region information, but fortunately gdnsd allows us to
overlay the accurate paid-for IPv4 database.
Add all of the US states (plus D.C.) to the map but pointed to eqiad for
now. This prepares the config for the eventual switch of some states to
ulsfo.
Change-Id: Id4228019667321074b0e21b11431d5cd25f3a401
---
M config-geo
1 file changed, 57 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo b/config-geo
index d2046c3..66142cd 100644
--- a/config-geo
+++ b/config-geo
@@ -1,8 +1,8 @@
plugins => { geoip => {
maps => {
generic-map => {
- geoip_db => /usr/share/GeoIP/GeoIPv6.dat
- geoip_db_v4_overlay => /usr/share/GeoIP/GeoIP.dat
+ geoip_db => /usr/share/GeoIP/GeoLiteCityv6.dat
+ geoip_db_v4_overlay => /usr/share/GeoIP/GeoIPCity.dat
datacenters => [eqiad pmtpa esams ulsfo]
map => {
# use ISO 3166-2 official names
@@ -95,6 +95,61 @@
UA => esams, # Ukraine
VA => esams, # Holy See (Vatican City
State)
},
+ NA => {
+ US => { # United States of America
+ AK => eqiad, # Alaska
+ AL => eqiad, # Alabama
+ AR => eqiad, # Arkansas
+ AZ => eqiad, # Arizona
+ CA => eqiad, # California
+ CO => eqiad, # Colorado
+ CT => eqiad, # Connecticut
+ DC => eqiad, # District of
Columbia
+ DE => eqiad, # Delaware
+ FL => eqiad, # Florida
+ GA => eqiad, # Georgia
+ HI => eqiad, # Hawaii
+ IA => eqiad, # Iowa
+ ID => eqiad, # Idaho
+ IL => eqiad, # Illinois
+ IN => eqiad, # Indiana
+ KS => eqiad, # Kansas
+ KY => eqiad, # Kentucky
+ LA => eqiad, # Louisiana
+ MA => eqiad, # Massachusetts
+ MD => eqiad, # Maryland
+ ME => eqiad, # Maine
+ MI => eqiad, # Michigan
+ MN => eqiad, # Minnesota
+ MO => eqiad, # Missouri
+ MS => eqiad, # Mississippi
+ MT => eqiad, # Montana
+ NC => eqiad, # North Carolina
+ ND => eqiad, # North Dakota
+ NE => eqiad, # Nebraska
+ NH => eqiad, # New Hampshire
+ NJ => eqiad, # New Jersey
+ NM => eqiad, # New Mexico
+ NV => eqiad, # Nevada
+ NY => eqiad, # New York
+ OH => eqiad, # Ohio
+ OK => eqiad, # Oklahoma
+ OR => eqiad, # Oregon
+ PA => eqiad, # Pennsylvania
+ RI => eqiad, # Rhode Island
+ SC => eqiad, # South Carolina
+ SD => eqiad, # South Dakota
+ TN => eqiad, # Tennessee
+ TX => eqiad, # Texas
+ UT => eqiad, # Utah
+ VA => eqiad, # Virginia
+ VT => eqiad, # Vermont
+ WA => eqiad, # Washington
+ WI => eqiad, # Wisconsin
+ WV => eqiad, # West Virginia
+ WY => eqiad, # Wyoming
+ },
+ },
OC => ulsfo,
default => eqiad,
}
--
To view, visit https://gerrit.wikimedia.org/r/93747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4228019667321074b0e21b11431d5cd25f3a401
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
