Jeremyb has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106109
Change subject: consolidate wikimedia.org; rm some redirect hops
......................................................................
consolidate wikimedia.org; rm some redirect hops
Change-Id: I27300f33a644f09379bc58613da4f702dfca684e
---
M redirects.conf
M redirects.dat
2 files changed, 22 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config
refs/changes/09/106109/1
diff --git a/redirects.conf b/redirects.conf
index d8d01c9..424e83c 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -349,6 +349,7 @@
ve.wikimedia.org \
wikimania.wikimedia.org \
labs.wikimedia.org \
+ wikimedia.org \
coffee.wikimedia.org \
mobile.wikipedia.org \
@@ -884,6 +885,9 @@
# funnel labs.wikimedia.org https://wikitech.wikimedia.org/
RewriteCond %{HTTP_HOST} =labs.wikimedia.org
RewriteRule . https://wikitech.wikimedia.org/ [R=301,L,NE]
+ # funnel wikimedia.org //www.wikimedia.org
+ RewriteCond %{HTTP_HOST} =wikimedia.org
+ RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://www.wikimedia.org/
[R=301,L,NE]
# funnel coffee.wikimedia.org
//en.wikipedia.org/wiki/Hyper_Text_Coffee_Pot_Control_Protocol
RewriteCond %{HTTP_HOST} =coffee.wikimedia.org
RewriteRule .
%{ENV:HTTP_X_Forwarded_Proto}://en.wikipedia.org/wiki/Hyper_Text_Coffee_Pot_Control_Protocol
[R=301,L,NE]
@@ -1105,18 +1109,18 @@
# rewrite *wikipedia.ee //et.wikipedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikipedia\.ee$
RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://et.wikipedia.org$0
[R=301,L,NE]
- # rewrite *wikimedia.biz //wikimedia.org
+ # rewrite *wikimedia.biz //www.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimedia.biz
- RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://wikimedia.org$0
[R=301,L,NE]
- # rewrite *wikimedia.biz //wikimedia.org
+ RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://www.wikimedia.org$0
[R=301,L,NE]
+ # rewrite *wikimedia.biz //www.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimedia\.biz$
- RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://wikimedia.org$0
[R=301,L,NE]
- # rewrite *wikimedia.jp.net //wikimedia.org
+ RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://www.wikimedia.org$0
[R=301,L,NE]
+ # rewrite *wikimedia.jp.net //www.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimedia.jp.net
- RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://wikimedia.org$0
[R=301,L,NE]
- # rewrite *wikimedia.jp.net //wikimedia.org
+ RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://www.wikimedia.org$0
[R=301,L,NE]
+ # rewrite *wikimedia.jp.net //www.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimedia\.jp\.net$
- RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://wikimedia.org$0
[R=301,L,NE]
+ RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://www.wikimedia.org$0
[R=301,L,NE]
# rewrite *wikimedia.lt //wikimediafoundation.org
RewriteCond %{HTTP_HOST} =wikimedia.lt
RewriteRule .*
%{ENV:HTTP_X_Forwarded_Proto}://wikimediafoundation.org$0 [R=301,L,NE]
@@ -1129,12 +1133,12 @@
# rewrite *wikipedia.lt //lt.wikipedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikipedia\.lt$
RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://lt.wikipedia.org$0
[R=301,L,NE]
- # rewrite *wikimemory.org //wikimedia.org
+ # rewrite *wikimemory.org //www.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimemory.org
- RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://wikimedia.org$0
[R=301,L,NE]
- # rewrite *wikimemory.org //wikimedia.org
+ RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://www.wikimedia.org$0
[R=301,L,NE]
+ # rewrite *wikimemory.org //www.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimemory\.org$
- RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://wikimedia.org$0
[R=301,L,NE]
+ RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://www.wikimedia.org$0
[R=301,L,NE]
# rewrite *en-wp.com //en.wikipedia.org
RewriteCond %{HTTP_HOST} =en-wp.com
RewriteRule .* %{ENV:HTTP_X_Forwarded_Proto}://en.wikipedia.org$0
[R=301,L,NE]
diff --git a/redirects.dat b/redirects.dat
index 22a1e61..d17d012 100644
--- a/redirects.dat
+++ b/redirects.dat
@@ -224,13 +224,13 @@
rewrite *wikipedia.ee //et.wikipedia.org
-rewrite *wikimedia.biz //wikimedia.org
-rewrite *wikimedia.jp.net //wikimedia.org
+rewrite *wikimedia.biz //www.wikimedia.org
+rewrite *wikimedia.jp.net //www.wikimedia.org
rewrite *wikimedia.lt //wikimediafoundation.org
rewrite *wikipedia.lt //lt.wikipedia.org
-rewrite *wikimemory.org //wikimedia.org
+rewrite *wikimemory.org //www.wikimedia.org
# Wikipedia
@@ -434,6 +434,9 @@
# wikimedia.us redirect
funnel *wikimedia.us //www.wikimedia.org
+# wikimedia.org redirect
+funnel wikimedia.org //www.wikimedia.org
+
# tartupeedia.ee (WMEE-owned domain) - bug 44893
funnel *tartupeedia.ee //et.wikipedia.org/wiki/Portaal:Tartupeedia
--
To view, visit https://gerrit.wikimedia.org/r/106109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27300f33a644f09379bc58613da4f702dfca684e
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Jeremyb <jer...@tuxmachine.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
