Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Remove www.([a-z-]+) rewrites
......................................................................
Remove www.([a-z-]+) rewrites
All of those don't resolve in DNS, so pointless being here
Bug: T120143
Change-Id: Ifdb1a512c14c2f157dcb3a97dc386266bd61ca36
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 0 insertions(+), 24 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index be31478..90624a1 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -255,10 +255,6 @@
#RewriteRule ^/upload/(.*)$ /upload/%1/$1
RewriteRule ^/upload/(.*)$
%{ENV:RW_PROTO}://upload.wikimedia.org/wikiquote/%1/$1 [R=302]
- # Send www.de.wikiquote.org -> de.wikiquote.org
- RewriteCond %{HTTP_HOST} ^www\.([a-z-]+)\.wikiquote\.org$
- RewriteRule ^(.*)$ %{ENV:RW_PROTO}://%1.wikiquote.org$1 [R=301,L]
-
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikiquote.org/w/index.php
RewriteRule ^/$ /w/index.php
@@ -390,10 +386,6 @@
# and is for the others...
RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.org/math/$1
[R=301]
- # Send www.de.wikipedia.org -> de.wikipedia.org
- RewriteCond %{HTTP_HOST} ^www\.([a-z-]+)\.wikipedia\.org$
- RewriteRule ^(.*)$ %{ENV:RW_PROTO}://%1.wikipedia.org$1 [R=301,L]
-
# moved wikistats off NFS
RewriteRule ^/wikistats(/(.*$)|$) %{ENV:RW_PROTO}://stats.wikimedia.org/$2
[R=302,L]
@@ -454,10 +446,6 @@
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
-
- # Send www.de.wikibooks.org -> de.wikibooks.org
- RewriteCond %{HTTP_HOST} ^www\.([a-z-]+)\.wikibooks\.org$
- RewriteRule ^(.*)$ %{ENV:RW_PROTO}://%1.wikibooks.org$1 [R=301,L]
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
@@ -539,10 +527,6 @@
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
- # Send www.de.wikisource.org -> de.wikisource.org
- RewriteCond %{HTTP_HOST} ^www\.([a-z-]+)\.wikisource\.org$
- RewriteRule ^(.*)$ %{ENV:RW_PROTO}://%1.wikisource.org$1 [R=301,L]
-
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikisource\.org
@@ -619,10 +603,6 @@
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
-
- # Send www.de.wikinews.org -> de.wikinews.org
- RewriteCond %{HTTP_HOST} ^www\.([a-z-]+)\.wikinews\.org$
- RewriteRule ^(.*)$ %{ENV:RW_PROTO}://%1.wikinews.org$1 [R=301,L]
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
@@ -702,10 +682,6 @@
# ShortURL redirect RT-2121
RewriteRule ^/s/.*$ /w/index.php
-
- # Send www.de.wikiversity.org -> de.wikiversity.org
- RewriteCond %{HTTP_HOST} ^www\.([a-z-]+)\.wikiversity\.org$
- RewriteRule ^(.*)$ %{ENV:RW_PROTO}://%1.wikiversity.org$1 [R=301,L]
# Uploads to the host-specific directory
# First grab the subdomain from HTTP_HOST
--
To view, visit https://gerrit.wikimedia.org/r/256441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdb1a512c14c2f157dcb3a97dc386266bd61ca36
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: MaxSem <[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
