Dzahn has submitted this change and it was merged.
Change subject: Modified redirects config concerning outreachwiki aliases
......................................................................
Modified redirects config concerning outreachwiki aliases
changed some education and bookshelf aliases
by resolving wiki redirects as well as switching to
Special:MyLanguage/ form for translatable ones.
Change-Id: Id513bb3ac165a9c97553af2772de28650eeea213
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
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 750234d..412c374 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -413,9 +413,9 @@
# override education.wikimedia.org/featuredarticle
//outreach.wikimedia.org/wiki/Education/Case_Studies/featuredarticle
RewriteCond %{HTTP_HOST} =education.wikimedia.org
RewriteRule ^/featuredarticle$
%{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Education/Case_Studies/featuredarticle
[R=301,L,NE]
- # override education.wikimedia.org/fivecriteria
//outreach.wikimedia.org/wiki/Education/Case_Studies/fivecriteria
+ # override education.wikimedia.org/fivecriteria
//outreach.wikimedia.org/wiki/Special:MyLanguage/Education/Case_Studies/fivecriteria
RewriteCond %{HTTP_HOST} =education.wikimedia.org
- RewriteRule ^/fivecriteria$
%{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Education/Case_Studies/fivecriteria
[R=301,L,NE]
+ RewriteRule ^/fivecriteria$
%{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Special:MyLanguage/Education/Case_Studies/fivecriteria
[R=301,L,NE]
# override education.wikimedia.org/illustrations
//outreach.wikimedia.org/wiki/Education/Case_Studies/illustrations
RewriteCond %{HTTP_HOST} =education.wikimedia.org
RewriteRule ^/illustrations$
%{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Education/Case_Studies/illustrations
[R=301,L,NE]
@@ -443,9 +443,9 @@
# override education.wikimedia.org/writearticle
//outreach.wikimedia.org/wiki/Education/Case_Studies/writearticle
RewriteCond %{HTTP_HOST} =education.wikimedia.org
RewriteRule ^/writearticle$
%{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Education/Case_Studies/writearticle
[R=301,L,NE]
- # override education.wikimedia.org/syllabus
//outreach.wikimedia.org/wiki/Education/The_Syllabus
+ # override education.wikimedia.org/syllabus
//outreach.wikimedia.org/wiki/Education/Syllabi
RewriteCond %{HTTP_HOST} =education.wikimedia.org
- RewriteRule ^/syllabus$
%{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Education/The_Syllabus
[R=301,L,NE]
+ RewriteRule ^/syllabus$
%{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Education/Syllabi [R=301,L,NE]
# override education.wikimedia.org/welcometowikipedia
//commons.wikimedia.org/wiki/File:Welcome_to_Wikipedia_brochure_EN.pdf
RewriteCond %{HTTP_HOST} =education.wikimedia.org
RewriteRule ^/welcometowikipedia$
%{ENV:RW_PROTO}://commons.wikimedia.org/wiki/File:Welcome_to_Wikipedia_brochure_EN.pdf
[R=301,L,NE]
@@ -672,9 +672,9 @@
# funnel educacao.wikimedia.org
//pt.wikipedia.org/wiki/Wikip%C3%A9dia:WU
RewriteCond %{HTTP_HOST} =educacao.wikimedia.org
RewriteRule . %{ENV:RW_PROTO}://pt.wikipedia.org/wiki/Wikip%C3%A9dia:WU
[R=301,L,NE]
- # funnel education.wikimedia.org
//outreach.wikimedia.org/wiki/Education
+ # funnel education.wikimedia.org
//outreach.wikimedia.org/wiki/Special:MyLanguage/Education
RewriteCond %{HTTP_HOST} =education.wikimedia.org
- RewriteRule . %{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Education
[R=301,L,NE]
+ RewriteRule .
%{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Special:MyLanguage/Education
[R=301,L,NE]
# rewrite wikiipedia.org //www.wikipedia.org
RewriteCond %{HTTP_HOST} =wikiipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikipedia.org$0
[R=301,L,NE]
@@ -786,7 +786,7 @@
# rewrite commons.wikipedia.org //commons.wikimedia.org
RewriteCond %{HTTP_HOST} =commons.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
- # rewrite bookshelf.wikimedia.org
//outreach.wikimedia.org/wiki/Bookshelf/
+ # rewrite bookshelf.wikimedia.org
//outreach.wikimedia.org/wiki/Bookshelf
RewriteCond %{HTTP_HOST} =bookshelf.wikimedia.org
RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Bookshelf$0 [R=301,L,NE]
# rewrite meta.wikipedia.org //meta.wikimedia.org
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index c554a1d..7ad29f1 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -130,7 +130,7 @@
override education.wikimedia.org/copyediting
//outreach.wikimedia.org/wiki/Education/Case_Studies/copyediting
override education.wikimedia.org/definitions
//outreach.wikimedia.org/wiki/Education/Case_Studies/definitions
override education.wikimedia.org/featuredarticle
//outreach.wikimedia.org/wiki/Education/Case_Studies/featuredarticle
-override education.wikimedia.org/fivecriteria
//outreach.wikimedia.org/wiki/Education/Case_Studies/fivecriteria
+override education.wikimedia.org/fivecriteria
//outreach.wikimedia.org/wiki/Special:MyLanguage/Education/Case_Studies/fivecriteria
override education.wikimedia.org/illustrations
//outreach.wikimedia.org/wiki/Education/Case_Studies/illustrations
override education.wikimedia.org/milestones
//outreach.wikimedia.org/wiki/Education/Case_Studies/milestones
override education.wikimedia.org/peerreviews
//outreach.wikimedia.org/wiki/Education/Case_Studies/peerreviews
@@ -141,11 +141,11 @@
override education.wikimedia.org/videos
//outreach.wikimedia.org/wiki/Education/Case_Studies/videos
override education.wikimedia.org/writearticle
//outreach.wikimedia.org/wiki/Education/Case_Studies/writearticle
-override education.wikimedia.org/syllabus
//outreach.wikimedia.org/wiki/Education/The_Syllabus
+override education.wikimedia.org/syllabus
//outreach.wikimedia.org/wiki/Education/Syllabi
override education.wikimedia.org/welcometowikipedia
//commons.wikimedia.org/wiki/File:Welcome_to_Wikipedia_brochure_EN.pdf
override education.wikimedia.org/instructorbasics
//commons.wikimedia.org/wiki/File:Instructor_Basics_How_to_Use_Wikipedia_as_a_Teaching_Tool.pdf
-funnel education.wikimedia.org //outreach.wikimedia.org/wiki/Education
+funnel education.wikimedia.org
//outreach.wikimedia.org/wiki/Special:MyLanguage/Education
# Localised TLDs
@@ -340,7 +340,7 @@
rewrite commons.wikipedia.org //commons.wikimedia.org
# Bookshelf Project
-rewrite bookshelf.wikimedia.org //outreach.wikimedia.org/wiki/Bookshelf/
+rewrite bookshelf.wikimedia.org //outreach.wikimedia.org/wiki/Bookshelf
# Random acquired cruft
funnel *wikidisclosure.com //www.wikimedia.org
--
To view, visit https://gerrit.wikimedia.org/r/241564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id513bb3ac165a9c97553af2772de28650eeea213
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Base <bas...@yandex.ru>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Glaisher <glaisher.w...@gmail.com>
Gerrit-Reviewer: Steinsplitter <steinsplit...@wikipedia.de>
Gerrit-Reviewer: Vogone <leon.liese...@wikipedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
