Faidon Liambotis has submitted this change and it was merged.
Change subject: apache: refresh redirects, were inconsistent
......................................................................
apache: refresh redirects, were inconsistent
Change-Id: I9eb0231483554cb3156cd7f96b0cf6301e02b698
---
M modules/mediawiki/files/apache/sites/redirects.conf
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 4d3dbcd..6942fe5 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -197,6 +197,8 @@
*.wikimania.asia \
wikimedia.com \
*.wikimedia.com \
+ wikimedia.community \
+ *.wikimedia.community \
wikimedia.us \
*.wikimedia.us \
tartupeedia.ee \
@@ -364,8 +366,6 @@
cz.wikimedia.org \
mediawiki.org \
wikimedia.org \
- wikimedia.community \
- *.wikimedia.community \
wikinews.org \
wikiquote.org \
wikiversity.org \
@@ -1549,18 +1549,18 @@
# rewrite *wikimania.asia //wikimania2013.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimania\.asia$
RewriteRule .* %{ENV:RW_PROTO}://wikimania2013.wikimedia.org$0
[R=301,L,NE]
- # funnel *wikimedia.community //www.wikimedia.org
- RewriteCond %{HTTP_HOST} =wikimedia.community
- RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
- # funnel *wikimedia.community //www.wikimedia.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wikimedia\.community$
- RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
# funnel *wikimedia.com //www.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimedia.com
RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
# funnel *wikimedia.com //www.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimedia\.com$
RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
+ # funnel *wikimedia.community //www.wikimedia.org
+ RewriteCond %{HTTP_HOST} =wikimedia.community
+ RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
+ # funnel *wikimedia.community //www.wikimedia.org
+ RewriteCond %{HTTP_HOST} ^(.+)\.wikimedia\.community$
+ RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
# funnel *wikimedia.us //www.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimedia.us
RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
--
To view, visit https://gerrit.wikimedia.org/r/178807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9eb0231483554cb3156cd7f96b0cf6301e02b698
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
