BBlack has submitted this change and it was merged.
Change subject: Remove wap/mobile subdomains from redirects
......................................................................
Remove wap/mobile subdomains from redirects
The DNS for these no longer exists
Bug: T104942
Change-Id: I2903ea1844f8d0a43d9c883423f0cebd6e36c97f
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 0 insertions(+), 17 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 355049c..a9c3284 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -233,8 +233,6 @@
ServerAlias *.jobs.wikimedia.org
ServerAlias jobs.wikipedia.org
ServerAlias *.jobs.wikipedia.org
- ServerAlias *.mobile.wikipedia.org
- ServerAlias *.wap.wikipedia.org
ServerAlias pywikipedia.org
ServerAlias *.pywikipedia.org
ServerAlias w.wiki
@@ -363,7 +361,6 @@
ServerAlias labs.wikimedia.org
ServerAlias labsconsole.wikimedia.org
ServerAlias coffee.wikimedia.org
- ServerAlias mobile.wikipedia.org
ServerAlias techblog.wikimedia.org
ServerAlias dev.wikimedia.org
ServerAlias old-bugzilla.wikimedia.org
@@ -912,9 +909,6 @@
# funnel coffee.wikimedia.org
//en.wikipedia.org/wiki/Hyper_Text_Coffee_Pot_Control_Protocol
RewriteCond %{HTTP_HOST} =coffee.wikimedia.org
RewriteRule .
%{ENV:RW_PROTO}://en.wikipedia.org/wiki/Hyper_Text_Coffee_Pot_Control_Protocol
[R=301,L,NE]
- # funnel mobile.wikipedia.org //m.wikipedia.org
- RewriteCond %{HTTP_HOST} =mobile.wikipedia.org
- RewriteRule . %{ENV:RW_PROTO}://m.wikipedia.org/ [R=301,L,NE]
# rewrite techblog.wikimedia.org //blog.wikimedia.org
RewriteCond %{HTTP_HOST} =techblog.wikimedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://blog.wikimedia.org$0
[R=301,L,NE]
@@ -1619,12 +1613,6 @@
# rewrite *jobs.wikipedia.org
//wikimediafoundation.org/wiki/Job_openings
RewriteCond %{HTTP_HOST} ^(.+)\.jobs\.wikipedia\.org$
RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Job_openings$0 [R=301,L,NE]
- # rewrite *.mobile.wikipedia.org //*.m.wikipedia.org
- RewriteCond %{HTTP_HOST} ^(.+)\.mobile\.wikipedia\.org$
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://%1.m.wikipedia.org$0
[R=301,L,NE]
- # rewrite *.wap.wikipedia.org //*.m.wikipedia.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wap\.wikipedia\.org$
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://%1.m.wikipedia.org$0
[R=301,L,NE]
# funnel *pywikipedia.org //tools.wmflabs.org/pywikibot/
RewriteCond %{HTTP_HOST} =pywikipedia.org
RewriteRule . %{ENV:RW_PROTO}://tools.wmflabs.org/pywikibot/
[R=301,L,NE]
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 4674dee..4554c9d 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -478,11 +478,6 @@
override *jobs.wikimedia.org/
//wikimediafoundation.org/wiki/Work_with_us
override *jobs.wikipedia.org/
//wikimediafoundation.org/wiki/Work_with_us
-# mobile redirects for commonly-used domains
-funnel mobile.wikipedia.org //m.wikipedia.org
-rewrite *.mobile.wikipedia.org //*.m.wikipedia.org
-rewrite *.wap.wikipedia.org //*.m.wikipedia.org
-
# pywikipedia.org (T60803).
funnel *pywikipedia.org //tools.wmflabs.org/pywikibot/
--
To view, visit https://gerrit.wikimedia.org/r/231612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2903ea1844f8d0a43d9c883423f0cebd6e36c97f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
