Dzahn has submitted this change and it was merged.
Change subject: Use %{TIME_YEAR} instead of updating Wikimania redirects every
year
......................................................................
Use %{TIME_YEAR} 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, 13 insertions(+), 14 deletions(-)
Approvals:
Alex Monk: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 8272042..3707e82 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -834,9 +834,9 @@
# rewrite ve.wikimedia.org http://wikimedia.org.ve
RewriteCond %{HTTP_HOST} =ve.wikimedia.org
RewriteRule ^[^\x00-\x1F]* http://wikimedia.org.ve$0 [R=301,L,NE]
- # rewrite wikimania.wikimedia.org //wikimania2016.wikimedia.org
+ # rewrite wikimania.wikimedia.org
//wikimania%{TIME_YEAR}.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimania.wikimedia.org
- 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 labs.wikimedia.org https://wikitech.wikimedia.org
RewriteCond %{HTTP_HOST} =labs.wikimedia.org
RewriteRule . https://wikitech.wikimedia.org/ [R=301,L,NE]
@@ -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..564b992 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -388,9 +388,9 @@
rewrite ve.wikimedia.org http://wikimedia.org.ve
# Wikimania
-rewrite *wikimania.org //wikimania2016.wikimedia.org
-rewrite *wikimania.com //wikimania2016.wikimedia.org
-rewrite wikimania.wikimedia.org //wikimania2016.wikimedia.org
+rewrite *wikimania.org //wikimania%{TIME_YEAR}.wikimedia.org
+rewrite *wikimania.com //wikimania%{TIME_YEAR}.wikimedia.org
+rewrite wikimania.wikimedia.org //wikimania%{TIME_YEAR}.wikimedia.org
# Labs redirects -> wikitech
funnel labs.wikimedia.org https://wikitech.wikimedia.org
@@ -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: merged
Gerrit-Change-Id: I54892aceb3c3bbbc5e5a270d1815bc2a4c4ca5c0
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
