Dzahn has submitted this change and it was merged.
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.
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, 4 insertions(+), 18 deletions(-)
Approvals:
John F. Lewis: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 642f30c..355049c 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
@@ -280,11 +279,9 @@
ServerAlias nb.wikiversity.org
ServerAlias pa.us.wikimedia.org
ServerAlias noboard.chapters.wikimedia.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
@@ -561,9 +558,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]
@@ -663,9 +657,6 @@
# rewrite noboard.chapters.wikimedia.org
//noboard-chapters.wikimedia.org
RewriteCond %{HTTP_HOST} =noboard.chapters.wikimedia.org
RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://noboard-chapters.wikimedia.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]
@@ -675,9 +666,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]
@@ -1205,10 +1193,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 b506ea6..4674dee 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
@@ -100,13 +100,11 @@
rewrite noboard.chapters.wikimedia.org //noboard-chapters.wikimedia.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
@@ -211,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
--
To view, visit https://gerrit.wikimedia.org/r/225041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4130f88e2285f9cffac14cd6dddf821906ba9463
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Glaisher <glaisher.w...@gmail.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Glaisher <glaisher.w...@gmail.com>
Gerrit-Reviewer: John F. Lewis <johnflewi...@gmail.com>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
