Jeremyb has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106110
Change subject: rm trailing slash from destinations where unneeded
......................................................................
rm trailing slash from destinations where unneeded
most already didn't have trailing slashes, just making it consistent
Change-Id: Id18a144c24252501a6edb9a3da384f718c82d042
---
M redirects.conf
M redirects.dat
2 files changed, 44 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config
refs/changes/10/106110/1
diff --git a/redirects.conf b/redirects.conf
index 424e83c..361fb20 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -495,64 +495,64 @@
RewriteRule ^/$
%{ENV:HTTP_X_Forwarded_Proto}://wikimediafoundation.org/wiki/Work_with_us
[R=301,L,NE]
# Type: plain
- # funnel shop.wiktionary.org //shop.wikimedia.org/
+ # funnel shop.wiktionary.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.wiktionary.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.wiktionary.org //shop.wikimedia.org/
+ # funnel store.wiktionary.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.wiktionary.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel shop.wikiquote.org //shop.wikimedia.org/
+ # funnel shop.wikiquote.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.wikiquote.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.wikiquote.org //shop.wikimedia.org/
+ # funnel store.wikiquote.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.wikiquote.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel shop.wikibooks.org //shop.wikimedia.org/
+ # funnel shop.wikibooks.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.wikibooks.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.wikibooks.org //shop.wikimedia.org/
+ # funnel store.wikibooks.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.wikibooks.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel shop.wikinews.org //shop.wikimedia.org/
+ # funnel shop.wikinews.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.wikinews.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.wikinews.org //shop.wikimedia.org/
+ # funnel store.wikinews.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.wikinews.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel shop.wikisource.org //shop.wikimedia.org/
+ # funnel shop.wikisource.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.wikisource.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.wikisource.org //shop.wikimedia.org/
+ # funnel store.wikisource.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.wikisource.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel shop.wikiversity.org //shop.wikimedia.org/
+ # funnel shop.wikiversity.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.wikiversity.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.wikiversity.org //shop.wikimedia.org/
+ # funnel store.wikiversity.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.wikiversity.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel shop.mediawiki.org //shop.wikimedia.org/
+ # funnel shop.mediawiki.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.mediawiki.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.mediawiki.org //shop.wikimedia.org/
+ # funnel store.mediawiki.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.mediawiki.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel shop.wikimediafoundation.org //shop.wikimedia.org/
+ # funnel shop.wikimediafoundation.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.wikimediafoundation.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.wikimediafoundation.org //shop.wikimedia.org/
+ # funnel store.wikimediafoundation.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.wikimediafoundation.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel shop.wikipedia.org //shop.wikimedia.org/
+ # funnel shop.wikipedia.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.wikipedia.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.wikipedia.org //shop.wikimedia.org/
+ # funnel store.wikipedia.org //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.wikipedia.org
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel shop.wikipedia.com //shop.wikimedia.org/
+ # funnel shop.wikipedia.com //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =shop.wikipedia.com
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
- # funnel store.wikipedia.com //shop.wikimedia.org/
+ # funnel store.wikipedia.com //shop.wikimedia.org
RewriteCond %{HTTP_HOST} =store.wikipedia.com
RewriteRule . %{ENV:HTTP_X_Forwarded_Proto}://shop.wikimedia.org/
[R=301,L,NE]
# rewrite donate.mediawiki.org https://donate.wikimedia.org
@@ -873,7 +873,7 @@
# funnel pk.wikimedia.org
//meta.wikimedia.org/wiki/Wikimedia_Community_User_Group_Pakistan
RewriteCond %{HTTP_HOST} =pk.wikimedia.org
RewriteRule .
%{ENV:HTTP_X_Forwarded_Proto}://meta.wikimedia.org/wiki/Wikimedia_Community_User_Group_Pakistan
[R=301,L,NE]
- # funnel pt.wikimedia.org http://wikimedia.pt/
+ # funnel pt.wikimedia.org http://wikimedia.pt
RewriteCond %{HTTP_HOST} =pt.wikimedia.org
RewriteRule . http://wikimedia.pt/ [R=301,L,NE]
# rewrite ve.wikimedia.org http://wikimedia.org.ve
@@ -882,7 +882,7 @@
# rewrite wikimania.wikimedia.org //wikimania2014.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimania.wikimedia.org
RewriteRule .*
%{ENV:HTTP_X_Forwarded_Proto}://wikimania2014.wikimedia.org$0 [R=301,L,NE]
- # funnel labs.wikimedia.org https://wikitech.wikimedia.org/
+ # 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
diff --git a/redirects.dat b/redirects.dat
index d17d012..695919b 100644
--- a/redirects.dat
+++ b/redirects.dat
@@ -48,26 +48,26 @@
#
# Shop redirects
-funnel shop.wiktionary.org //shop.wikimedia.org/
-funnel store.wiktionary.org //shop.wikimedia.org/
-funnel shop.wikiquote.org //shop.wikimedia.org/
-funnel store.wikiquote.org //shop.wikimedia.org/
-funnel shop.wikibooks.org //shop.wikimedia.org/
-funnel store.wikibooks.org //shop.wikimedia.org/
-funnel shop.wikinews.org //shop.wikimedia.org/
-funnel store.wikinews.org //shop.wikimedia.org/
-funnel shop.wikisource.org //shop.wikimedia.org/
-funnel store.wikisource.org //shop.wikimedia.org/
-funnel shop.wikiversity.org //shop.wikimedia.org/
-funnel store.wikiversity.org //shop.wikimedia.org/
-funnel shop.mediawiki.org //shop.wikimedia.org/
-funnel store.mediawiki.org //shop.wikimedia.org/
-funnel shop.wikimediafoundation.org //shop.wikimedia.org/
-funnel store.wikimediafoundation.org //shop.wikimedia.org/
-funnel shop.wikipedia.org //shop.wikimedia.org/
-funnel store.wikipedia.org //shop.wikimedia.org/
-funnel shop.wikipedia.com //shop.wikimedia.org/
-funnel store.wikipedia.com //shop.wikimedia.org/
+funnel shop.wiktionary.org //shop.wikimedia.org
+funnel store.wiktionary.org //shop.wikimedia.org
+funnel shop.wikiquote.org //shop.wikimedia.org
+funnel store.wikiquote.org //shop.wikimedia.org
+funnel shop.wikibooks.org //shop.wikimedia.org
+funnel store.wikibooks.org //shop.wikimedia.org
+funnel shop.wikinews.org //shop.wikimedia.org
+funnel store.wikinews.org //shop.wikimedia.org
+funnel shop.wikisource.org //shop.wikimedia.org
+funnel store.wikisource.org //shop.wikimedia.org
+funnel shop.wikiversity.org //shop.wikimedia.org
+funnel store.wikiversity.org //shop.wikimedia.org
+funnel shop.mediawiki.org //shop.wikimedia.org
+funnel store.mediawiki.org //shop.wikimedia.org
+funnel shop.wikimediafoundation.org //shop.wikimedia.org
+funnel store.wikimediafoundation.org //shop.wikimedia.org
+funnel shop.wikipedia.org //shop.wikimedia.org
+funnel store.wikipedia.org //shop.wikimedia.org
+funnel shop.wikipedia.com //shop.wikimedia.org
+funnel store.wikipedia.com //shop.wikimedia.org
# Donate wiki
rewrite donate.mediawiki.org https://donate.wikimedia.org
@@ -416,7 +416,7 @@
funnel pk.wikimedia.org
//meta.wikimedia.org/wiki/Wikimedia_Community_User_Group_Pakistan
# pt.wikimedia.org was migrated to wikimedia.pt
-funnel pt.wikimedia.org http://wikimedia.pt/
+funnel pt.wikimedia.org http://wikimedia.pt
rewrite ve.wikimedia.org http://wikimedia.org.ve
@@ -426,7 +426,7 @@
rewrite *wikimania.asia //wikimania2013.wikimedia.org
# labs -> wikitech
-funnel labs.wikimedia.org https://wikitech.wikimedia.org/
+funnel labs.wikimedia.org https://wikitech.wikimedia.org
# wikimedia.com redirect
funnel *wikimedia.com //www.wikimedia.org
--
To view, visit https://gerrit.wikimedia.org/r/106110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id18a144c24252501a6edb9a3da384f718c82d042
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
