BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/283364

Change subject: Switch mobile hostnames to text IP
......................................................................

Switch mobile hostnames to text IP

This allows HTTP/2 and/or SPDY coalesce of mobile and desktop
-hostname requests, which a single client might issue under a
variety of circumstances (mobile referencing desktop-hostname API
URLs, desktop->mobile redirects, etc).

Note because not all zones affected by the template change have
explicit updates, deployment will need the workaround from
https://phabricator.wikimedia.org/T97051#1994679

Bug: T124482
Change-Id: I51f40644b93e04fca6c95379d9fd8db032a070a4
---
M templates/helpers/langlist.tmpl
M templates/mediawiki.org
M templates/wikibooks.org
M templates/wikidata.org
M templates/wikimedia.org
M templates/wikimediafoundation.org
M templates/wikinews.org
M templates/wikipedia.org
M templates/wikiquote.org
M templates/wikisource.org
M templates/wikiversity.org
M templates/wikivoyage.org
M templates/wiktionary.org
13 files changed, 76 insertions(+), 76 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/64/283364/1

diff --git a/templates/helpers/langlist.tmpl b/templates/helpers/langlist.tmpl
index dbb8b7b..cf31fa9 100644
--- a/templates/helpers/langlist.tmpl
+++ b/templates/helpers/langlist.tmpl
@@ -2,9 +2,9 @@
 
 {% macro geolang(lang, zero) -%}
 {{ lang }}              600 IN DYNA    geoip!text-addrs
-{{ lang }}.m            600 IN DYNA    geoip!mobile-addrs
+{{ lang }}.m            600 IN DYNA    geoip!text-addrs
 {%- if zero %}
-{{ lang }}.zero         600 IN DYNA    geoip!mobile-addrs
+{{ lang }}.zero         600 IN DYNA    geoip!text-addrs
 {%- endif -%}
 {%- endmacro %}
 
diff --git a/templates/mediawiki.org b/templates/mediawiki.org
index 762e73d..15c886d 100644
--- a/templates/mediawiki.org
+++ b/templates/mediawiki.org
@@ -46,4 +46,4 @@
 svn             600 IN DYNA     geoip!text-addrs
 
 ; Mobile
-m               600 IN DYNA     geoip!mobile-addrs
+m               600 IN DYNA     geoip!text-addrs
diff --git a/templates/wikibooks.org b/templates/wikibooks.org
index 240f9eb..c92cde1 100644
--- a/templates/wikibooks.org
+++ b/templates/wikibooks.org
@@ -40,4 +40,4 @@
 {{ geolanglist() }}
 
 ; Mobile
-m           600 IN DYNA     geoip!mobile-addrs
+m           600 IN DYNA     geoip!text-addrs
diff --git a/templates/wikidata.org b/templates/wikidata.org
index 44b1235..d84a649 100644
--- a/templates/wikidata.org
+++ b/templates/wikidata.org
@@ -38,5 +38,5 @@
 www         600 IN DYNA     geoip!text-addrs
 
 ; Mobile
-m           600 IN DYNA     geoip!mobile-addrs
-test.m      600 IN DYNA     geoip!mobile-addrs
+m           600 IN DYNA     geoip!text-addrs
+test.m      600 IN DYNA     geoip!text-addrs
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 6e7ee32..2fab60e 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -82,7 +82,7 @@
 ; XXX temporary, should be DYNA geoip!maps-addrs
 maps                1H  IN A    208.80.154.244
                     1H  IN AAAA 2620:0:861:ed1a::2:d
-m           600 DYNA geoip!mobile-addrs
+m           600 DYNA geoip!text-addrs
 misc-web-lb 600 DYNA geoip!misc-addrs
 geoiplookup 600 DYNA geoip!geoiplookup-addrs
 donate      600 DYNA geoip!text-addrs
@@ -294,60 +294,60 @@
 
 ; Mobile
 
-advisory.m          600 IN DYNA     geoip!mobile-addrs
-ar.m                600 IN DYNA     geoip!mobile-addrs
-bd.m                600 IN DYNA     geoip!mobile-addrs
-be.m                600 IN DYNA     geoip!mobile-addrs
-br.m                600 IN DYNA     geoip!mobile-addrs
-ca.m                600 IN DYNA     geoip!mobile-addrs
-chapcom.m           600 IN DYNA     geoip!mobile-addrs
-checkuser.m         600 IN DYNA     geoip!mobile-addrs
-cn.m                600 IN DYNA     geoip!mobile-addrs
-co.m                600 IN DYNA     geoip!mobile-addrs
-commons.m           600 IN DYNA     geoip!mobile-addrs
-dk.m                600 IN DYNA     geoip!mobile-addrs
-ee.m                600 IN DYNA     geoip!mobile-addrs
-et.m                600 IN DYNA     geoip!mobile-addrs
-incubator.m         600 IN DYNA     geoip!mobile-addrs
-fdc.m               600 IN DYNA     geoip!mobile-addrs
-fi.m                600 IN DYNA     geoip!mobile-addrs
-legalteam.m         600 IN DYNA     geoip!mobile-addrs
-meta.m              600 IN DYNA     geoip!mobile-addrs
-mk.m                600 IN DYNA     geoip!mobile-addrs
-mx.m                600 IN DYNA     geoip!mobile-addrs
-nl.m                600 IN DYNA     geoip!mobile-addrs
-no.m                600 IN DYNA     geoip!mobile-addrs
-nostalgia.m         600 IN DYNA     geoip!mobile-addrs
-nyc.m               600 IN DYNA     geoip!mobile-addrs
-nz.m                600 IN DYNA     geoip!mobile-addrs
-office.m            600 IN DYNA     geoip!mobile-addrs
-outreach.m          600 IN DYNA     geoip!mobile-addrs
-quality.m           600 IN DYNA     geoip!mobile-addrs
-pa-us.m             600 IN DYNA     geoip!mobile-addrs
-pl.m                600 IN DYNA     geoip!mobile-addrs
-pt.m                600 IN DYNA     geoip!mobile-addrs
-rs.m                600 IN DYNA     geoip!mobile-addrs
-ru.m                600 IN DYNA     geoip!mobile-addrs
-se.m                600 IN DYNA     geoip!mobile-addrs
-species.m           600 IN DYNA     geoip!mobile-addrs
-steward.m           600 IN DYNA     geoip!mobile-addrs
-strategy.m          600 IN DYNA     geoip!mobile-addrs
-tr.m                600 IN DYNA     geoip!mobile-addrs
-ua.m                600 IN DYNA     geoip!mobile-addrs
-usability.m         600 IN DYNA     geoip!mobile-addrs
-vote.m              600 IN DYNA     geoip!mobile-addrs
-wikimania2007.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2008.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2009.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2010.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2011.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2012.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2013.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2014.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2015.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2016.m     600 IN DYNA     geoip!mobile-addrs
-wikimania2017.m     600 IN DYNA     geoip!mobile-addrs
-wikitech.m          600 IN DYNA     geoip!mobile-addrs
+advisory.m          600 IN DYNA     geoip!text-addrs
+ar.m                600 IN DYNA     geoip!text-addrs
+bd.m                600 IN DYNA     geoip!text-addrs
+be.m                600 IN DYNA     geoip!text-addrs
+br.m                600 IN DYNA     geoip!text-addrs
+ca.m                600 IN DYNA     geoip!text-addrs
+chapcom.m           600 IN DYNA     geoip!text-addrs
+checkuser.m         600 IN DYNA     geoip!text-addrs
+cn.m                600 IN DYNA     geoip!text-addrs
+co.m                600 IN DYNA     geoip!text-addrs
+commons.m           600 IN DYNA     geoip!text-addrs
+dk.m                600 IN DYNA     geoip!text-addrs
+ee.m                600 IN DYNA     geoip!text-addrs
+et.m                600 IN DYNA     geoip!text-addrs
+incubator.m         600 IN DYNA     geoip!text-addrs
+fdc.m               600 IN DYNA     geoip!text-addrs
+fi.m                600 IN DYNA     geoip!text-addrs
+legalteam.m         600 IN DYNA     geoip!text-addrs
+meta.m              600 IN DYNA     geoip!text-addrs
+mk.m                600 IN DYNA     geoip!text-addrs
+mx.m                600 IN DYNA     geoip!text-addrs
+nl.m                600 IN DYNA     geoip!text-addrs
+no.m                600 IN DYNA     geoip!text-addrs
+nostalgia.m         600 IN DYNA     geoip!text-addrs
+nyc.m               600 IN DYNA     geoip!text-addrs
+nz.m                600 IN DYNA     geoip!text-addrs
+office.m            600 IN DYNA     geoip!text-addrs
+outreach.m          600 IN DYNA     geoip!text-addrs
+quality.m           600 IN DYNA     geoip!text-addrs
+pa-us.m             600 IN DYNA     geoip!text-addrs
+pl.m                600 IN DYNA     geoip!text-addrs
+pt.m                600 IN DYNA     geoip!text-addrs
+rs.m                600 IN DYNA     geoip!text-addrs
+ru.m                600 IN DYNA     geoip!text-addrs
+se.m                600 IN DYNA     geoip!text-addrs
+species.m           600 IN DYNA     geoip!text-addrs
+steward.m           600 IN DYNA     geoip!text-addrs
+strategy.m          600 IN DYNA     geoip!text-addrs
+tr.m                600 IN DYNA     geoip!text-addrs
+ua.m                600 IN DYNA     geoip!text-addrs
+usability.m         600 IN DYNA     geoip!text-addrs
+vote.m              600 IN DYNA     geoip!text-addrs
+wikimania2007.m     600 IN DYNA     geoip!text-addrs
+wikimania2008.m     600 IN DYNA     geoip!text-addrs
+wikimania2009.m     600 IN DYNA     geoip!text-addrs
+wikimania2010.m     600 IN DYNA     geoip!text-addrs
+wikimania2011.m     600 IN DYNA     geoip!text-addrs
+wikimania2012.m     600 IN DYNA     geoip!text-addrs
+wikimania2013.m     600 IN DYNA     geoip!text-addrs
+wikimania2014.m     600 IN DYNA     geoip!text-addrs
+wikimania2015.m     600 IN DYNA     geoip!text-addrs
+wikimania2016.m     600 IN DYNA     geoip!text-addrs
+wikimania2017.m     600 IN DYNA     geoip!text-addrs
+wikitech.m          600 IN DYNA     geoip!text-addrs
 
 ; Networking
 cr1-eqiad       1H  IN A    208.80.154.196
diff --git a/templates/wikimediafoundation.org 
b/templates/wikimediafoundation.org
index 19b922b..632b323 100644
--- a/templates/wikimediafoundation.org
+++ b/templates/wikimediafoundation.org
@@ -38,4 +38,4 @@
 ; Wikis (alphabetic order)
 
 www         600 IN DYNA     geoip!text-addrs
-m           600 IN DYNA     geoip!mobile-addrs
+m           600 IN DYNA     geoip!text-addrs
diff --git a/templates/wikinews.org b/templates/wikinews.org
index 1c66948..78ab1c8 100644
--- a/templates/wikinews.org
+++ b/templates/wikinews.org
@@ -40,4 +40,4 @@
 {{ geolanglist() }}
 
 ; Mobile
-m           600 IN DYNA     geoip!mobile-addrs
+m           600 IN DYNA     geoip!text-addrs
diff --git a/templates/wikipedia.org b/templates/wikipedia.org
index 3198085..8578db5 100644
--- a/templates/wikipedia.org
+++ b/templates/wikipedia.org
@@ -41,16 +41,16 @@
 nostalgia               600     IN DYNA         geoip!text-addrs
 quote                   600     IN DYNA         geoip!text-addrs
 quality                 600     IN DYNA         geoip!text-addrs
-quality.m               600     IN DYNA         geoip!mobile-addrs
+quality.m               600     IN DYNA         geoip!text-addrs
 sep11                   600     IN DYNA         geoip!text-addrs
 sources                 600     IN DYNA         geoip!text-addrs
 species                 600     IN DYNA         geoip!text-addrs
 ten                     600     IN DYNA         geoip!text-addrs
-ten.m                   600     IN DYNA         geoip!mobile-addrs
+ten.m                   600     IN DYNA         geoip!text-addrs
 test                    600     IN DYNA         geoip!text-addrs
 test2                   600     IN DYNA         geoip!text-addrs
-test.m                  600     IN DYNA         geoip!mobile-addrs
-test2.m                 600     IN DYNA         geoip!mobile-addrs
+test.m                  600     IN DYNA         geoip!text-addrs
+test2.m                 600     IN DYNA         geoip!text-addrs
 textbook                600     IN DYNA         geoip!text-addrs
 wg-en                   600     IN DYNA         geoip!text-addrs
 www                     600     IN DYNA         geoip!text-addrs
@@ -67,12 +67,12 @@
 donate          600 IN DYNA     geoip!text-addrs
 download        600 IN DYNA     geoip!text-addrs
 jobs            600 IN DYNA     geoip!text-addrs
-m               600 IN DYNA     geoip!mobile-addrs
+m               600 IN DYNA     geoip!text-addrs
 mail            600 IN DYNA     geoip!text-addrs
 shop            600 IN DYNA     geoip!text-addrs
 stats           1H  IN CNAME    stats.wikimedia.org.
 store           600 IN DYNA     geoip!text-addrs
-zero            600 IN DYNA     geoip!mobile-addrs
+zero            600 IN DYNA     geoip!text-addrs
 
 ; TLS testing, "temporary"
 pinkunicorn     600 IN A        208.80.154.42
diff --git a/templates/wikiquote.org b/templates/wikiquote.org
index 16d0a0a..dcfd8b4 100644
--- a/templates/wikiquote.org
+++ b/templates/wikiquote.org
@@ -40,4 +40,4 @@
 {{ geolanglist() }}
 
 ; Mobile
-m           600 IN DYNA     geoip!mobile-addrs
+m           600 IN DYNA     geoip!text-addrs
diff --git a/templates/wikisource.org b/templates/wikisource.org
index 7e1b679..a5fb9a7 100644
--- a/templates/wikisource.org
+++ b/templates/wikisource.org
@@ -41,5 +41,5 @@
 {{ geolanglist() }}
 
 ; Mobile
-m           600 IN DYNA     geoip!mobile-addrs
-mul.m       600 in DYNA     geoip!mobile-addrs
\ No newline at end of file
+m           600 IN DYNA     geoip!text-addrs
+mul.m       600 in DYNA     geoip!text-addrs
\ No newline at end of file
diff --git a/templates/wikiversity.org b/templates/wikiversity.org
index c5b5f78..8e9615c 100644
--- a/templates/wikiversity.org
+++ b/templates/wikiversity.org
@@ -35,11 +35,11 @@
 ; Wikis (alphabetic order)
 
 beta        600 IN DYNA     geoip!text-addrs
-beta.m      600 IN DYNA     geoip!mobile-addrs
+beta.m      600 IN DYNA     geoip!text-addrs
 www         600 IN DYNA     geoip!text-addrs
 
 ; All languages will automatically be included here.
 {{ geolanglist() }}
 
 ; Mobile
-m           600 IN DYNA     geoip!mobile-addrs
+m           600 IN DYNA     geoip!text-addrs
diff --git a/templates/wikivoyage.org b/templates/wikivoyage.org
index 6a4429c..737656b 100644
--- a/templates/wikivoyage.org
+++ b/templates/wikivoyage.org
@@ -40,4 +40,4 @@
 {{ geolanglist() }}
 
 ; Mobile
-m           600 IN DYNA     geoip!mobile-addrs
+m           600 IN DYNA     geoip!text-addrs
diff --git a/templates/wiktionary.org b/templates/wiktionary.org
index 4f49e1f..921913a 100644
--- a/templates/wiktionary.org
+++ b/templates/wiktionary.org
@@ -40,4 +40,4 @@
 {{ geolanglist() }}
 
 ; Mobile
-m           600 IN DYNA     geoip!mobile-addrs
+m           600 IN DYNA     geoip!text-addrs

-- 
To view, visit https://gerrit.wikimedia.org/r/283364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51f40644b93e04fca6c95379d9fd8db032a070a4
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to