Faidon Liambotis has submitted this change and it was merged.
Change subject: Switch cs/cz.wikimedia.org redirect to funnel
......................................................................
Switch cs/cz.wikimedia.org redirect to funnel
As this is the behavior exhibited by their existing webserver.
Change-Id: Ia546e464c350099dafd9182a14336114070901bc
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 78bcd7f..91433da 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -906,12 +906,12 @@
# rewrite mail.wikipedia.org https://lists.wikimedia.org
RewriteCond %{HTTP_HOST} =mail.wikipedia.org
RewriteRule .* https://lists.wikimedia.org$0 [R=301,L,NE]
- # rewrite cs.wikimedia.org http://www.wikimedia.cz
+ # funnel cs.wikimedia.org http://www.wikimedia.cz
RewriteCond %{HTTP_HOST} =cs.wikimedia.org
- RewriteRule .* http://www.wikimedia.cz$0 [R=301,L,NE]
- # rewrite cz.wikimedia.org http://www.wikimedia.cz
+ RewriteRule . http://www.wikimedia.cz/ [R=301,L,NE]
+ # funnel cz.wikimedia.org http://www.wikimedia.cz
RewriteCond %{HTTP_HOST} =cz.wikimedia.org
- RewriteRule .* http://www.wikimedia.cz$0 [R=301,L,NE]
+ RewriteRule . http://www.wikimedia.cz/ [R=301,L,NE]
# rewrite mediawiki.org //www.mediawiki.org
RewriteCond %{HTTP_HOST} =mediawiki.org
RewriteRule .* %{ENV:RW_PROTO}://www.mediawiki.org$0 [R=301,L,NE]
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index b6a741b..f152bff 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -412,8 +412,8 @@
rewrite mail.wikipedia.org https://lists.wikimedia.org
-rewrite cs.wikimedia.org http://www.wikimedia.cz
-rewrite cz.wikimedia.org http://www.wikimedia.cz
+funnel cs.wikimedia.org http://www.wikimedia.cz
+funnel cz.wikimedia.org http://www.wikimedia.cz
###############
## projects
--
To view, visit https://gerrit.wikimedia.org/r/169307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia546e464c350099dafd9182a14336114070901bc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
