Glaisher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225041
Change subject: Remove several dead domains from redirects
......................................................................
Remove several dead domains from redirects
* de-beta.wikipedia.org -> //de.wikipedia.org
* tp.wikipedia.org -> //tokipona.wikipedia.org
* zh-cn.wikipedia.org -> //zh.wikipedia.org
Also added a comment next to wikipedia.co.uk entry which
doesn't work and updated comment for w.wiki entry.
Bug: T105981
Change-Id: I4130f88e2285f9cffac14cd6dddf821906ba9463
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 5 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/225041/1
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 5802f1f..4c08f5d 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -246,7 +246,6 @@
ServerAlias store.wikipedia.com
ServerAlias sep11.wikipedia.org
ServerAlias be-x-old.wikisource.org
- ServerAlias de-beta.wikipedia.org
ServerAlias cz.wikipedia.org
ServerAlias cz.wikipedia.com
ServerAlias cz.wikibooks.org
@@ -278,11 +277,9 @@
ServerAlias arbcom.nl.wikipedia.org
ServerAlias noboard.chapters.wikimedia.org
ServerAlias wg.en.wikipedia.org
- ServerAlias tp.wikipedia.org
ServerAlias zh-cfr.wikipedia.org
ServerAlias minnan.wikipedia.org
ServerAlias nan.wikipedia.org
- ServerAlias zh-cn.wikipedia.org
ServerAlias zh-tw.wikipedia.org
ServerAlias educacao.wikimedia.org
ServerAlias education.wikimedia.org
@@ -559,9 +556,6 @@
# rewrite be-x-old.wikisource.org //be.wikisource.org # T43755
RewriteCond %{HTTP_HOST} =be-x-old.wikisource.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://be.wikisource.org$0
[R=301,L,NE]
- # rewrite de-beta.wikipedia.org //de.wikipedia.org
- RewriteCond %{HTTP_HOST} =de-beta.wikipedia.org
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://de.wikipedia.org$0
[R=301,L,NE]
# rewrite cz.wikipedia.org //cs.wikipedia.org
RewriteCond %{HTTP_HOST} =cz.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://cs.wikipedia.org$0
[R=301,L,NE]
@@ -655,9 +649,6 @@
# rewrite wg.en.wikipedia.org //wg-en.wikipedia.org
RewriteCond %{HTTP_HOST} =wg.en.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://wg-en.wikipedia.org$0
[R=301,L,NE]
- # rewrite tp.wikipedia.org //tokipona.wikipedia.org
- RewriteCond %{HTTP_HOST} =tp.wikipedia.org
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://tokipona.wikipedia.org$0
[R=301,L,NE]
# rewrite zh-cfr.wikipedia.org //zh-min-nan.wikipedia.org
RewriteCond %{HTTP_HOST} =zh-cfr.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://zh-min-nan.wikipedia.org$0
[R=301,L,NE]
@@ -667,9 +658,6 @@
# rewrite nan.wikipedia.org //zh-min-nan.wikipedia.org
RewriteCond %{HTTP_HOST} =nan.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://zh-min-nan.wikipedia.org$0
[R=301,L,NE]
- # rewrite zh-cn.wikipedia.org //zh.wikipedia.org
- RewriteCond %{HTTP_HOST} =zh-cn.wikipedia.org
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://zh.wikipedia.org$0
[R=301,L,NE]
# rewrite zh-tw.wikipedia.org //zh.wikipedia.org
RewriteCond %{HTTP_HOST} =zh-tw.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://zh.wikipedia.org$0
[R=301,L,NE]
@@ -1197,10 +1185,10 @@
# rewrite *en-wp.org //en.wikipedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.en\-wp\.org$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
- # rewrite *wikipedia.co.uk //en.wikipedia.org
+ # rewrite *wikipedia.co.uk //en.wikipedia.org # XXX
doesn't work; expired domain
RewriteCond %{HTTP_HOST} =wikipedia.co.uk
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
- # rewrite *wikipedia.co.uk //en.wikipedia.org
+ # rewrite *wikipedia.co.uk //en.wikipedia.org # XXX
doesn't work; expired domain
RewriteCond %{HTTP_HOST} ^(.+)\.wikipedia\.co\.uk$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
# rewrite *.wikipedia.com //*.wikipedia.org
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index f2258f6..37a36f4 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -62,7 +62,7 @@
# Language aliases
rewrite be-x-old.wikisource.org //be.wikisource.org # T43755
-rewrite de-beta.wikipedia.org //de.wikipedia.org
+
rewrite cz.wikipedia.org //cs.wikipedia.org
rewrite cz.wikipedia.com //cs.wikipedia.org
rewrite cz.wikibooks.org //cs.wikibooks.org
@@ -101,13 +101,10 @@
rewrite wg.en.wikipedia.org //wg-en.wikipedia.org
-rewrite tp.wikipedia.org //tokipona.wikipedia.org
-
rewrite zh-cfr.wikipedia.org //zh-min-nan.wikipedia.org
rewrite minnan.wikipedia.org //zh-min-nan.wikipedia.org
rewrite nan.wikipedia.org //zh-min-nan.wikipedia.org
-rewrite zh-cn.wikipedia.org //zh.wikipedia.org
rewrite zh-tw.wikipedia.org //zh.wikipedia.org
# RT #4240
@@ -212,7 +209,7 @@
rewrite en.wikipedia.com //en.wikipedia.org
-rewrite *wikipedia.co.uk //en.wikipedia.org
+rewrite *wikipedia.co.uk //en.wikipedia.org # XXX doesn't work;
expired domain
rewrite *.wikipedia.com //*.wikipedia.org
rewrite *.wikipedia.net //*.wikipedia.org
@@ -489,7 +486,7 @@
# pywikipedia.org (T60803).
funnel *pywikipedia.org //tools.wmflabs.org/pywikibot/
-# w.wiki - upcoming URL shortener
+# w.wiki - URL shortener
funnel *w.wiki //www.wikipedia.org
# T84277
--
To view, visit https://gerrit.wikimedia.org/r/225041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4130f88e2285f9cffac14cd6dddf821906ba9463
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Glaisher <glaisher.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
