Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/204996
Change subject: mediawiki: Update redirects.conf using refreshDomainRedirects
......................................................................
mediawiki: Update redirects.conf using refreshDomainRedirects
Change-Id: Ie0556ca55cf977042aca452c5592de3dc409a86a
---
M modules/mediawiki/files/apache/sites/redirects.conf
1 file changed, 37 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/204996/1
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index e2cceee..a6f4309 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -25,9 +25,6 @@
*.wikiartpedia.net \
wikiartpedia.org \
*.wikiartpedia.org \
- *.wikibooks.com \
- *.wikibook.com \
- *.wikibook.org \
wikinews.de \
*.wikinews.de \
wicipediacymraeg.org \
@@ -127,6 +124,9 @@
*.wiktionary.com \
wiktionary.eu \
*.wiktionary.eu \
+ *.wikibook.org \
+ *.wikibook.com \
+ *.wikibooks.com \
*.wikisource.com \
*.wikiquote.com \
*.wikiquote.net \
@@ -307,14 +307,6 @@
nan.wikipedia.org \
zh-cn.wikipedia.org \
zh-tw.wikipedia.org \
- wikibooks.org \
- wikibooks.com \
- www.wikibooks.com \
- wikibooks.de \
- www.wikibooks.de \
- wikibook.com \
- wikibook.org \
- textbook.wikipedia.org \
educacao.wikimedia.org \
education.wikimedia.org \
www.wikiipedia.org \
@@ -329,6 +321,12 @@
wiki-pedia.org \
wiktionary.com \
www.wiktionary.com \
+ wikibook.org \
+ wikibook.com \
+ wikibooks.com \
+ wikibooks.de \
+ www.wikibooks.de \
+ textbook.wikipedia.org \
sources.wikipedia.org \
wikisource.com \
quote.wikipedia.org \
@@ -372,6 +370,7 @@
wikiquote.org \
wikiversity.org \
wikivoyage.org \
+ wikibooks.org \
wiktionary.org \
wikidata.org \
www.wikisource.org \
@@ -738,27 +737,6 @@
# rewrite zh-tw.wikipedia.org //zh.wikipedia.org
RewriteCond %{HTTP_HOST} =zh-tw.wikipedia.org
RewriteRule .* %{ENV:RW_PROTO}://zh.wikipedia.org$0 [R=301,L,NE]
- # rewrite wikibooks.com //www.wikibooks.org
- RewriteCond %{HTTP_HOST} =wikibooks.com
- RewriteRule .* %{ENV:RW_PROTO}://www.wikibooks.org$0 [R=301,L,NE]
- # rewrite www.wikibooks.com //www.wikibooks.org
- RewriteCond %{HTTP_HOST} =www.wikibooks.com
- RewriteRule .* %{ENV:RW_PROTO}://www.wikibooks.org$0 [R=301,L,NE]
- # rewrite wikibooks.de //de.wikibooks.org
- RewriteCond %{HTTP_HOST} =wikibooks.de
- RewriteRule .* %{ENV:RW_PROTO}://de.wikibooks.org$0 [R=301,L,NE]
- # rewrite www.wikibooks.de //de.wikibooks.org
- RewriteCond %{HTTP_HOST} =www.wikibooks.de
- RewriteRule .* %{ENV:RW_PROTO}://de.wikibooks.org$0 [R=301,L,NE]
- # rewrite wikibook.com //www.wikibooks.org
- RewriteCond %{HTTP_HOST} =wikibook.com
- RewriteRule .* %{ENV:RW_PROTO}://www.wikibooks.org$0 [R=301,L,NE]
- # rewrite wikibook.org //www.wikibooks.org
- RewriteCond %{HTTP_HOST} =wikibook.org
- RewriteRule .* %{ENV:RW_PROTO}://www.wikibooks.org$0 [R=301,L,NE]
- # rewrite textbook.wikipedia.org //www.wikibooks.org
- RewriteCond %{HTTP_HOST} =textbook.wikipedia.org
- RewriteRule .* %{ENV:RW_PROTO}://www.wikibooks.org$0 [R=301,L,NE]
# 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]
@@ -804,6 +782,24 @@
# rewrite www.wiktionary.com //www.wiktionary.org
RewriteCond %{HTTP_HOST} =www.wiktionary.com
RewriteRule .* %{ENV:RW_PROTO}://www.wiktionary.org$0 [R=301,L,NE]
+ # rewrite wikibook.org //www.wikibooks.org
+ RewriteCond %{HTTP_HOST} =wikibook.org
+ RewriteRule .* %{ENV:RW_PROTO}://www.wikibooks.org$0 [R=301,L,NE]
+ # rewrite wikibook.com //www.wikibooks.org
+ RewriteCond %{HTTP_HOST} =wikibook.com
+ RewriteRule .* %{ENV:RW_PROTO}://www.wikibooks.org$0 [R=301,L,NE]
+ # rewrite wikibooks.com //www.wikibooks.org
+ RewriteCond %{HTTP_HOST} =wikibooks.com
+ RewriteRule .* %{ENV:RW_PROTO}://www.wikibooks.org$0 [R=301,L,NE]
+ # rewrite wikibooks.de //de.wikibooks.org
+ RewriteCond %{HTTP_HOST} =wikibooks.de
+ RewriteRule .* %{ENV:RW_PROTO}://de.wikibooks.org$0 [R=301,L,NE]
+ # rewrite www.wikibooks.de //de.wikibooks.org
+ RewriteCond %{HTTP_HOST} =www.wikibooks.de
+ RewriteRule .* %{ENV:RW_PROTO}://de.wikibooks.org$0 [R=301,L,NE]
+ # rewrite textbook.wikipedia.org //www.wikibooks.org
+ RewriteCond %{HTTP_HOST} =textbook.wikipedia.org
+ RewriteRule .* %{ENV:RW_PROTO}://www.wikibooks.org$0 [R=301,L,NE]
# rewrite sources.wikipedia.org //wikisource.org
RewriteCond %{HTTP_HOST} =sources.wikipedia.org
RewriteRule .* %{ENV:RW_PROTO}://wikisource.org$0 [R=301,L,NE]
@@ -1046,15 +1042,6 @@
# funnel *wikiartpedia.org //www.wikipedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikiartpedia\.org$
RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
- # rewrite *.wikibooks.com //*.wikibooks.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wikibooks\.com$
- RewriteRule .* %{ENV:RW_PROTO}://%1.wikibooks.org$0 [R=301,L,NE]
- # rewrite *.wikibook.com //*.wikibooks.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wikibook\.com$
- RewriteRule .* %{ENV:RW_PROTO}://%1.wikibooks.org$0 [R=301,L,NE]
- # rewrite *.wikibook.org //*.wikibooks.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wikibook\.org$
- RewriteRule .* %{ENV:RW_PROTO}://%1.wikibooks.org$0 [R=301,L,NE]
# rewrite *wikinews.de //de.wikinews.org
RewriteCond %{HTTP_HOST} =wikinews.de
RewriteRule .* %{ENV:RW_PROTO}://de.wikinews.org$0 [R=301,L,NE]
@@ -1352,6 +1339,15 @@
# funnel *wiktionary.eu //www.wiktionary.org
RewriteCond %{HTTP_HOST} ^(.+)\.wiktionary\.eu$
RewriteRule . %{ENV:RW_PROTO}://www.wiktionary.org/ [R=301,L,NE]
+ # rewrite *.wikibook.org //*.wikibooks.org
+ RewriteCond %{HTTP_HOST} ^(.+)\.wikibook\.org$
+ RewriteRule .* %{ENV:RW_PROTO}://%1.wikibooks.org$0 [R=301,L,NE]
+ # rewrite *.wikibook.com //*.wikibooks.org
+ RewriteCond %{HTTP_HOST} ^(.+)\.wikibook\.com$
+ RewriteRule .* %{ENV:RW_PROTO}://%1.wikibooks.org$0 [R=301,L,NE]
+ # rewrite *.wikibooks.com //*.wikibooks.org
+ RewriteCond %{HTTP_HOST} ^(.+)\.wikibooks\.com$
+ RewriteRule .* %{ENV:RW_PROTO}://%1.wikibooks.org$0 [R=301,L,NE]
# rewrite *.wikisource.com //*.wikisource.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikisource\.com$
RewriteRule .* %{ENV:RW_PROTO}://%1.wikisource.org$0 [R=301,L,NE]
--
To view, visit https://gerrit.wikimedia.org/r/204996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0556ca55cf977042aca452c5592de3dc409a86a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
