Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/270479 )
Change subject: Apache configuration for pt.wikimedia.org
......................................................................
Apache configuration for pt.wikimedia.org
The domain pt.wikimedia.org were configured as a redirect
to www.wikimedia.pt.
We now treat it as a vhost for a wiki hosted in the WMF cluster.
Bug: T126832
Change-Id: Ice2bd8171d1168aba111e7600f8c6504b1289f96
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
M modules/mediawiki/files/apache/sites/wikimedia.conf
3 files changed, 1 insertion(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index f91fc19..0351b28 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -280,7 +280,6 @@
ServerAlias it.wikimedia.org
ServerAlias kr.wikimedia.org
ServerAlias pk.wikimedia.org
- ServerAlias pt.wikimedia.org
ServerAlias uk.wikimedia.org
ServerAlias ve.wikimedia.org
ServerAlias wikimania.wikimedia.org
@@ -806,9 +805,6 @@
# funnel pk.wikimedia.org http://wikimediapakistan.org
RewriteCond %{HTTP_HOST} =pk.wikimedia.org
RewriteRule . http://wikimediapakistan.org/ [R=301,L,NE]
- # funnel pt.wikimedia.org http://wikimedia.pt
- RewriteCond %{HTTP_HOST} =pt.wikimedia.org
- RewriteRule . http://wikimedia.pt/ [R=301,L,NE]
# rewrite uk.wikimedia.org https://wikimedia.org.uk/
RewriteCond %{HTTP_HOST} =uk.wikimedia.org
RewriteRule ^[^\x00-\x1F]* https://wikimedia.org.uk$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 e9b4f6d..1e6885a0 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -374,9 +374,6 @@
# pk.wikimedia.org (T56780)
funnel pk.wikimedia.org http://wikimediapakistan.org
-# pt.wikimedia.org was migrated to wikimedia.pt
-funnel pt.wikimedia.org http://wikimedia.pt
-
rewrite uk.wikimedia.org https://wikimedia.org.uk/
rewrite ve.wikimedia.org http://wikimedia.org.ve
diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf
b/modules/mediawiki/files/apache/sites/wikimedia.conf
index dfa1942..796e7ea 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -2,7 +2,7 @@
# Local user groups assimilated by AffCom to chapters are also added in this
vhost.
<VirtualHost *:80>
ServerName wikimedia-chapter
- ServerAlias ar.wikimedia.org bd.wikimedia.org be.wikimedia.org
br.wikimedia.org ca.wikimedia.org cn.wikimedia.org co.wikimedia.org
dk.wikimedia.org ec.wikimedia.org ee.wikimedia.org fi.wikimedia.org
il.wikimedia.org mk.wikimedia.org mx.wikimedia.org nl.wikimedia.org
no.wikimedia.org noboard-chapters.wikimedia.org nyc.wikimedia.org
nz.wikimedia.org pa-us.wikimedia.org pl.wikimedia.org rs.wikimedia.org
ru.wikimedia.org se.wikimedia.org tr.wikimedia.org ua.wikimedia.org
us.wikimedia.org wb.wikimedia.org
+ ServerAlias ar.wikimedia.org bd.wikimedia.org be.wikimedia.org
br.wikimedia.org ca.wikimedia.org cn.wikimedia.org co.wikimedia.org
dk.wikimedia.org ec.wikimedia.org ee.wikimedia.org fi.wikimedia.org
il.wikimedia.org mk.wikimedia.org mx.wikimedia.org nl.wikimedia.org
no.wikimedia.org noboard-chapters.wikimedia.org nyc.wikimedia.org
nz.wikimedia.org pa-us.wikimedia.org pl.wikimedia.org pt.wikimedia.org
rs.wikimedia.org ru.wikimedia.org se.wikimedia.org tr.wikimedia.org
ua.wikimedia.org us.wikimedia.org wb.wikimedia.org
UseCanonicalName off
RewriteEngine On
--
To view, visit https://gerrit.wikimedia.org/r/270479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice2bd8171d1168aba111e7600f8c6504b1289f96
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Luke081515 <luke081...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
