Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/243688 )
Change subject: sites/redirects: Redirect *.pywikibot.org to tool labs
......................................................................
sites/redirects: Redirect *.pywikibot.org to tool labs
Bug: T106311
Change-Id: I1a2795d65efba13d9be91f8cd6e2e1344cc137b0
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
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 ef14b26..70ab2e3 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -186,6 +186,8 @@
ServerAlias *.jobs.wikipedia.org
ServerAlias pywikipedia.org
ServerAlias *.pywikipedia.org
+ ServerAlias pywikibot.org
+ ServerAlias *.pywikibot.org
ServerAlias w.wiki
ServerAlias *.w.wiki
ServerAlias shop.wikimedia.org
@@ -1423,6 +1425,12 @@
# funnel *pywikipedia.org //tools.wmflabs.org/pywikibot/
RewriteCond %{HTTP_HOST} ^(.+)\.pywikipedia\.org$
RewriteRule . %{ENV:RW_PROTO}://tools.wmflabs.org/pywikibot/
[R=301,L,NE]
+ # funnel *pywikibot.org //tools.wmflabs.org/pywikibot/
+ RewriteCond %{HTTP_HOST} =pywikibot.org
+ RewriteRule . %{ENV:RW_PROTO}://tools.wmflabs.org/pywikibot/
[R=301,L,NE]
+ # funnel *pywikibot.org //tools.wmflabs.org/pywikibot/
+ RewriteCond %{HTTP_HOST} ^(.+)\.pywikibot\.org$
+ RewriteRule . %{ENV:RW_PROTO}://tools.wmflabs.org/pywikibot/
[R=301,L,NE]
# funnel *w.wiki //meta.wikimedia.org/wiki/Special:UrlShortener
RewriteCond %{HTTP_HOST} =w.wiki
RewriteRule .
%{ENV:RW_PROTO}://meta.wikimedia.org/wiki/Special:UrlShortener [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 2cd3ead..a6c4779 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -445,6 +445,9 @@
# pywikipedia.org (T60803).
funnel *pywikipedia.org //tools.wmflabs.org/pywikibot/
+# pywikibot.org (T106311)
+funnel *pywikibot.org //tools.wmflabs.org/pywikibot/
+
# w.wiki - upcoming URL shortener
funnel *w.wiki //meta.wikimedia.org/wiki/Special:UrlShortener
--
To view, visit https://gerrit.wikimedia.org/r/243688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a2795d65efba13d9be91f8cd6e2e1344cc137b0
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
