Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/285084 )
Change subject: apache: Get rid of redirects for non-resolving/parked domains
......................................................................
apache: Get rid of redirects for non-resolving/parked domains
Bug: T105981
Change-Id: I8d11b00118931a4733eb7df5517b89aaa616c8e8
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 0 insertions(+), 114 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 8e0c501..f91fc19 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -73,8 +73,6 @@
ServerAlias *.en-wp.com
ServerAlias en-wp.org
ServerAlias *.en-wp.org
- ServerAlias wikipedia.co.uk
- ServerAlias *.wikipedia.co.uk
ServerAlias *.wikipedia.com
ServerAlias *.wikipedia.net
ServerAlias *.wikipedia.info
@@ -84,8 +82,6 @@
ServerAlias *.wiki-pedia.org
ServerAlias wiikipedia.com
ServerAlias *.wiikipedia.com
- ServerAlias wekipedia.com
- ServerAlias *.wekipedia.com
ServerAlias wikiepdia.com
ServerAlias *.wikiepdia.com
ServerAlias wikiepdia.org
@@ -111,7 +107,6 @@
ServerAlias wikispecies.net
ServerAlias *.wikispecies.net
ServerAlias *.wikiversity.com
- ServerAlias *.wikiversity.net
ServerAlias *.wikiversity.info
ServerAlias *.wikivoyage.com
ServerAlias *.wikivoyage.de
@@ -134,14 +129,10 @@
ServerAlias *.wikimediacommons.info
ServerAlias wikimediacommons.mobi
ServerAlias *.wikimediacommons.mobi
- ServerAlias wikimediacommons.eu
- ServerAlias *.wikimediacommons.eu
ServerAlias wikimediacommons.org
ServerAlias *.wikimediacommons.org
ServerAlias wikimediacommons.jp.net
ServerAlias *.wikimediacommons.jp.net
- ServerAlias wikimediacommons.pt
- ServerAlias *.wikimediacommons.pt
ServerAlias wikimediacommons.co.uk
ServerAlias *.wikimediacommons.co.uk
ServerAlias mediawiki.com
@@ -158,24 +149,10 @@
ServerAlias *.wikimedia.us
ServerAlias tartupeedia.ee
ServerAlias *.tartupeedia.ee
- ServerAlias indiawikipedia.com
- ServerAlias *.indiawikipedia.com
ServerAlias wikipedia.in
ServerAlias *.wikipedia.in
ServerAlias wikipediazero.org
ServerAlias *.wikipediazero.org
- ServerAlias wikimediastories.com
- ServerAlias *.wikimediastories.com
- ServerAlias wikimediastories.net
- ServerAlias *.wikimediastories.net
- ServerAlias wikimediastories.org
- ServerAlias *.wikimediastories.org
- ServerAlias wikipediastories.com
- ServerAlias *.wikipediastories.com
- ServerAlias wikipediastories.net
- ServerAlias *.wikipediastories.net
- ServerAlias wikipediastories.org
- ServerAlias *.wikipediastories.org
ServerAlias careers.wikimedia.org
ServerAlias *.careers.wikimedia.org
ServerAlias careers.wikipedia.org
@@ -262,7 +239,6 @@
ServerAlias wikinews.com
ServerAlias species.wikipedia.org
ServerAlias wikiversity.com
- ServerAlias wikiversity.net
ServerAlias wikiversity.info
ServerAlias wikivoyage.com
ServerAlias wikivoyage.de
@@ -707,9 +683,6 @@
# rewrite wikiversity.com //www.wikiversity.org
RewriteCond %{HTTP_HOST} =wikiversity.com
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikiversity.org$0
[R=301,L,NE]
- # rewrite wikiversity.net //www.wikiversity.org
- RewriteCond %{HTTP_HOST} =wikiversity.net
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikiversity.org$0
[R=301,L,NE]
# rewrite wikiversity.info //www.wikiversity.org
RewriteCond %{HTTP_HOST} =wikiversity.info
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikiversity.org$0
[R=301,L,NE]
@@ -1090,12 +1063,6 @@
# rewrite *en-wp.org //en.wikipedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.en\-wp\.org$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
- # rewrite *wikipedia.co.uk //en.wikipedia.org # XXX
doesn't work; expired domain
- RewriteCond %{HTTP_HOST} =wikipedia.co.uk
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
- # rewrite *wikipedia.co.uk //en.wikipedia.org # XXX
doesn't work; expired domain
- RewriteCond %{HTTP_HOST} ^(.+)\.wikipedia\.co\.uk$
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
# rewrite *.wikipedia.com //*.wikipedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikipedia\.com$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://%1.wikipedia.org$0
[R=301,L,NE]
@@ -1122,12 +1089,6 @@
RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
# funnel *wiikipedia.com //www.wikipedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wiikipedia\.com$
- RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
- # funnel *wekipedia.com //www.wikipedia.org
- RewriteCond %{HTTP_HOST} =wekipedia.com
- RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
- # funnel *wekipedia.com //www.wikipedia.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wekipedia\.com$
RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
# funnel *wikiepdia.com //www.wikipedia.org
RewriteCond %{HTTP_HOST} =wikiepdia.com
@@ -1204,9 +1165,6 @@
# rewrite *.wikiversity.com //*.wikiversity.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikiversity\.com$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://%1.wikiversity.org$0
[R=301,L,NE]
- # rewrite *.wikiversity.net //*.wikiversity.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wikiversity\.net$
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://%1.wikiversity.org$0
[R=301,L,NE]
# rewrite *.wikiversity.info //*.wikiversity.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikiversity\.info$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://%1.wikiversity.org$0
[R=301,L,NE]
@@ -1273,12 +1231,6 @@
# rewrite *wikimediacommons.mobi //commons.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimediacommons\.mobi$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
- # rewrite *wikimediacommons.eu //commons.wikimedia.org
- RewriteCond %{HTTP_HOST} =wikimediacommons.eu
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
- # rewrite *wikimediacommons.eu //commons.wikimedia.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wikimediacommons\.eu$
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
# rewrite *wikimediacommons.org //commons.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimediacommons.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
@@ -1290,12 +1242,6 @@
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
# rewrite *wikimediacommons.jp.net //commons.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimediacommons\.jp\.net$
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
- # rewrite *wikimediacommons.pt //commons.wikimedia.org
- RewriteCond %{HTTP_HOST} =wikimediacommons.pt
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
- # rewrite *wikimediacommons.pt //commons.wikimedia.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wikimediacommons\.pt$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
# rewrite *wikimediacommons.co.uk //commons.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimediacommons.co.uk
@@ -1345,12 +1291,6 @@
# funnel *tartupeedia.ee
//et.wikipedia.org/wiki/Portaal:Tartupeedia
RewriteCond %{HTTP_HOST} ^(.+)\.tartupeedia\.ee$
RewriteRule .
%{ENV:RW_PROTO}://et.wikipedia.org/wiki/Portaal:Tartupeedia [R=301,L,NE]
- # funnel *indiawikipedia.com
http://wikimedia.in/wikipedia.html
- RewriteCond %{HTTP_HOST} =indiawikipedia.com
- RewriteRule . http://wikimedia.in/wikipedia.html [R=301,L,NE]
- # funnel *indiawikipedia.com
http://wikimedia.in/wikipedia.html
- RewriteCond %{HTTP_HOST} ^(.+)\.indiawikipedia\.com$
- RewriteRule . http://wikimedia.in/wikipedia.html [R=301,L,NE]
# funnel *wikipedia.in http://wikimedia.in/wikipedia.html
RewriteCond %{HTTP_HOST} =wikipedia.in
RewriteRule . http://wikimedia.in/wikipedia.html [R=301,L,NE]
@@ -1363,42 +1303,6 @@
# funnel *wikipediazero.org
//wikimediafoundation.org/wiki/Wikipedia_Zero
RewriteCond %{HTTP_HOST} ^(.+)\.wikipediazero\.org$
RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Wikipedia_Zero [R=301,L,NE]
- # funnel *wikimediastories.com
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} =wikimediastories.com
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikimediastories.com
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} ^(.+)\.wikimediastories\.com$
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikimediastories.net
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} =wikimediastories.net
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikimediastories.net
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} ^(.+)\.wikimediastories\.net$
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikimediastories.org
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} =wikimediastories.org
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikimediastories.org
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} ^(.+)\.wikimediastories\.org$
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikipediastories.com
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} =wikipediastories.com
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikipediastories.com
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} ^(.+)\.wikipediastories\.com$
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikipediastories.net
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} =wikipediastories.net
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikipediastories.net
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} ^(.+)\.wikipediastories\.net$
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikipediastories.org
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} =wikipediastories.org
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
- # funnel *wikipediastories.org
//wikimediafoundation.org/wiki/Thank_You_All
- RewriteCond %{HTTP_HOST} ^(.+)\.wikipediastories\.org$
- RewriteRule .
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Thank_You_All [R=301,L,NE]
# rewrite *careers.wikimedia.org
//wikimediafoundation.org/wiki/Job_openings
RewriteCond %{HTTP_HOST} =careers.wikimedia.org
RewriteRule ^[^\x00-\x1F]*
%{ENV:RW_PROTO}://wikimediafoundation.org/wiki/Job_openings$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 f882d59..e9b4f6d 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -199,8 +199,6 @@
rewrite en.wikipedia.com //en.wikipedia.org
-rewrite *wikipedia.co.uk //en.wikipedia.org # XXX doesn't work;
expired domain
-
rewrite *.wikipedia.com //*.wikipedia.org
rewrite *.wikipedia.net //*.wikipedia.org
rewrite *.wikipedia.info //*.wikipedia.org
@@ -212,7 +210,6 @@
# wikipedia typo domains to www. instead of en - RT #4679,#4681
funnel *wiikipedia.com //www.wikipedia.org
-funnel *wekipedia.com //www.wikipedia.org
funnel *wikiepdia.com //www.wikipedia.org
funnel *wikiepdia.org //www.wikipedia.org
funnel *wikiipedia.org //www.wikipedia.org
@@ -271,11 +268,9 @@
# Wikiversity
rewrite *.wikiversity.com //*.wikiversity.org
-rewrite *.wikiversity.net //*.wikiversity.org
rewrite *.wikiversity.info //*.wikiversity.org
rewrite wikiversity.com //www.wikiversity.org
-rewrite wikiversity.net //www.wikiversity.org
rewrite wikiversity.info //www.wikiversity.org
# Wikivoyage
@@ -311,10 +306,8 @@
rewrite *wikimediacommons.net //commons.wikimedia.org
rewrite *wikimediacommons.info //commons.wikimedia.org
rewrite *wikimediacommons.mobi //commons.wikimedia.org
-rewrite *wikimediacommons.eu //commons.wikimedia.org
rewrite *wikimediacommons.org //commons.wikimedia.org
rewrite *wikimediacommons.jp.net //commons.wikimedia.org
-rewrite *wikimediacommons.pt //commons.wikimedia.org
rewrite *wikimediacommons.co.uk //commons.wikimedia.org
rewrite commons.wikipedia.org //commons.wikimedia.org
@@ -409,9 +402,6 @@
# tartupeedia.ee (WMEE-owned domain) - T46893
funnel *tartupeedia.ee //et.wikipedia.org/wiki/Portaal:Tartupeedia
-# indiawikipedia.com - RT #1395
-funnel *indiawikipedia.com http://wikimedia.in/wikipedia.html
-
# wikipedia.in
funnel *wikipedia.in http://wikimedia.in/wikipedia.html
@@ -423,14 +413,6 @@
# wikipediazero.org - T82495
funnel *wikipediazero.org //wikimediafoundation.org/wiki/Wikipedia_Zero
-
-# wikimediastories.com/net/org - T82390
-funnel *wikimediastories.com //wikimediafoundation.org/wiki/Thank_You_All
-funnel *wikimediastories.net //wikimediafoundation.org/wiki/Thank_You_All
-funnel *wikimediastories.org //wikimediafoundation.org/wiki/Thank_You_All
-funnel *wikipediastories.com //wikimediafoundation.org/wiki/Thank_You_All
-funnel *wikipediastories.net //wikimediafoundation.org/wiki/Thank_You_All
-funnel *wikipediastories.org //wikimediafoundation.org/wiki/Thank_You_All
# jobs/careers - T82975
rewrite *careers.wikimedia.org
//wikimediafoundation.org/wiki/Job_openings
--
To view, visit https://gerrit.wikimedia.org/r/285084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d11b00118931a4733eb7df5517b89aaa616c8e8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
