Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199754
Change subject: adjust shop redirects to changed shop URL
......................................................................
adjust shop redirects to changed shop URL
The shop URL is changing from shop.wikimedia.org to store.wikipedia.org.
So change all the redirect targets to store.wikipedia and add the old
URL as a redirect instead of the new one.
Needs to go with a DNS change at I91d611e89a8e6b39ed7d
Bug:T92438
Change-Id: Ia13c9b8e05c15f9545b70b6b28aa9f8574b9de77
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 62 insertions(+), 62 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/199754/1
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 1c41249..7de6450 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -254,7 +254,7 @@
shop.wikimediafoundation.org \
store.wikimediafoundation.org \
shop.wikipedia.org \
- store.wikipedia.org \
+ shop.wikimedia.org \
shop.wikipedia.com \
store.wikipedia.com \
donate.mediawiki.org \
@@ -528,66 +528,66 @@
RewriteRule ^/$
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Work_with_us [R=301,L,NE]
# Type: plain
- # funnel shop.wiktionary.org //shop.wikimedia.org
+ # funnel shop.wiktionary.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.wiktionary.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.wiktionary.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel store.wiktionary.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =store.wiktionary.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel shop.wikiquote.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.wikiquote.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.wikiquote.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.wikiquote.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel store.wikiquote.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =store.wikiquote.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel shop.wikibooks.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.wikibooks.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.wikibooks.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.wikibooks.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel store.wikibooks.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =store.wikibooks.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel shop.wikinews.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.wikinews.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.wikinews.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.wikinews.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel store.wikinews.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =store.wikinews.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel shop.wikisource.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.wikisource.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.wikisource.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.wikisource.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel store.wikisource.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =store.wikisource.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel shop.wikiversity.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.wikiversity.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.wikiversity.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.wikiversity.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel store.wikiversity.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =store.wikiversity.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel shop.mediawiki.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.mediawiki.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.mediawiki.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.mediawiki.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel store.mediawiki.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =store.mediawiki.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel shop.wikimediafoundation.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.wikimediafoundation.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.wikimediafoundation.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.wikimediafoundation.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel store.wikimediafoundation.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =store.wikimediafoundation.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel shop.wikipedia.org //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.wikipedia.org //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.wikipedia.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.wikipedia.org //shop.wikimedia.org
- RewriteCond %{HTTP_HOST} =store.wikipedia.org
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel shop.wikipedia.com //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.wikimedia.org //store.wikipedia.org
+ RewriteCond %{HTTP_HOST} =shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel shop.wikipedia.com //store.wikipedia.org
RewriteCond %{HTTP_HOST} =shop.wikipedia.com
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
- # funnel store.wikipedia.com //shop.wikimedia.org
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
+ # funnel store.wikipedia.com //store.wikipedia.org
RewriteCond %{HTTP_HOST} =store.wikipedia.com
- RewriteRule . %{ENV:RW_PROTO}://shop.wikimedia.org/ [R=301,L,NE]
+ RewriteRule . %{ENV:RW_PROTO}://store.wikipedia.org/ [R=301,L,NE]
# rewrite donate.mediawiki.org https://donate.wikimedia.org
RewriteCond %{HTTP_HOST} =donate.mediawiki.org
RewriteRule .* https://donate.wikimedia.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 9f54d4a..f261efb 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/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 //store.wikipedia.org
+funnel store.wiktionary.org //store.wikipedia.org
+funnel shop.wikiquote.org //store.wikipedia.org
+funnel store.wikiquote.org //store.wikipedia.org
+funnel shop.wikibooks.org //store.wikipedia.org
+funnel store.wikibooks.org //store.wikipedia.org
+funnel shop.wikinews.org //store.wikipedia.org
+funnel store.wikinews.org //store.wikipedia.org
+funnel shop.wikisource.org //store.wikipedia.org
+funnel store.wikisource.org //store.wikipedia.org
+funnel shop.wikiversity.org //store.wikipedia.org
+funnel store.wikiversity.org //store.wikipedia.org
+funnel shop.mediawiki.org //store.wikipedia.org
+funnel store.mediawiki.org //store.wikipedia.org
+funnel shop.wikimediafoundation.org //store.wikipedia.org
+funnel store.wikimediafoundation.org //store.wikipedia.org
+funnel shop.wikipedia.org //store.wikipedia.org
+funnel shop.wikimedia.org //store.wikipedia.org
+funnel shop.wikipedia.com //store.wikipedia.org
+funnel store.wikipedia.com //store.wikipedia.org
# Donate wiki
rewrite donate.mediawiki.org https://donate.wikimedia.org
--
To view, visit https://gerrit.wikimedia.org/r/199754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia13c9b8e05c15f9545b70b6b28aa9f8574b9de77
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
