Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262670
Change subject: Use %{YEAR_DATE} instead of updating Wikimania redirects every
year
......................................................................
Use %{YEAR_DATE} instead of updating Wikimania redirects every year
Change-Id: I54892aceb3c3bbbc5e5a270d1815bc2a4c4ca5c0
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 10 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/262670/1
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 8272042..672cc40 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -1295,18 +1295,18 @@
# rewrite *mediawiki.com //www.mediawiki.org
RewriteCond %{HTTP_HOST} ^(.+)\.mediawiki\.com$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.mediawiki.org$0
[R=301,L,NE]
- # rewrite *wikimania.org //wikimania2016.wikimedia.org
+ # rewrite *wikimania.org //wikimania%{TIME_YEAR}.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimania.org
- RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimania2016.wikimedia.org$0 [R=301,L,NE]
- # rewrite *wikimania.org //wikimania2016.wikimedia.org
+ RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimania%{TIME_YEAR}.wikimedia.org$0 [R=301,L,NE]
+ # rewrite *wikimania.org //wikimania%{TIME_YEAR}.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimania\.org$
- RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimania2016.wikimedia.org$0 [R=301,L,NE]
- # rewrite *wikimania.com //wikimania2016.wikimedia.org
+ RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimania%{TIME_YEAR}.wikimedia.org$0 [R=301,L,NE]
+ # rewrite *wikimania.com //wikimania%{TIME_YEAR}.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimania.com
- RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimania2016.wikimedia.org$0 [R=301,L,NE]
- # rewrite *wikimania.com //wikimania2016.wikimedia.org
+ RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimania%{TIME_YEAR}.wikimedia.org$0 [R=301,L,NE]
+ # rewrite *wikimania.com //wikimania%{TIME_YEAR}.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimania\.com$
- RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimania2016.wikimedia.org$0 [R=301,L,NE]
+ RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimania%{TIME_YEAR}.wikimedia.org$0 [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]
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 99b8a9c..f3de909 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -388,8 +388,8 @@
rewrite ve.wikimedia.org http://wikimedia.org.ve
# Wikimania
-rewrite *wikimania.org //wikimania2016.wikimedia.org
-rewrite *wikimania.com //wikimania2016.wikimedia.org
+rewrite *wikimania.org //wikimania%{TIME_YEAR}.wikimedia.org
+rewrite *wikimania.com //wikimania%{TIME_YEAR}.wikimedia.org
rewrite wikimania.wikimedia.org //wikimania2016.wikimedia.org
# Labs redirects -> wikitech
@@ -475,4 +475,3 @@
# rewrite download.wiki(m|p)edia to dumps.wikimedia - T107575
rewrite download.wikimedia.org https://dumps.wikimedia.org
rewrite download.wikipedia.org https://dumps.wikimedia.org
-
--
To view, visit https://gerrit.wikimedia.org/r/262670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54892aceb3c3bbbc5e5a270d1815bc2a4c4ca5c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
