Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/243348

Change subject: apache: remove wikimaps redirects
......................................................................

apache: remove wikimaps redirects

Change-Id: I1ddfcbfdb9afef6517ec074e49ff94393d112dc1
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 0 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/243348/1

diff --git a/modules/mediawiki/files/apache/sites/redirects.conf 
b/modules/mediawiki/files/apache/sites/redirects.conf
index 412c374..2be5f0a 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -177,12 +177,6 @@
        ServerAlias *.wikidisclosure.com
        ServerAlias wikidisclosure.org
        ServerAlias *.wikidisclosure.org
-       ServerAlias wikimaps.com
-       ServerAlias *.wikimaps.com
-       ServerAlias wikimaps.net
-       ServerAlias *.wikimaps.net
-       ServerAlias wikimaps.org
-       ServerAlias *.wikimaps.org
        ServerAlias mediawiki.com
        ServerAlias *.mediawiki.com
        ServerAlias softwarewikipedia.com
@@ -1444,24 +1438,6 @@
        RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
        # funnel        *wikidisclosure.org     //www.wikimedia.org
        RewriteCond %{HTTP_HOST} ^(.+)\.wikidisclosure\.org$
-       RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
-       # funnel        *wikimaps.com   //www.wikimedia.org
-       RewriteCond %{HTTP_HOST} =wikimaps.com
-       RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
-       # funnel        *wikimaps.com   //www.wikimedia.org
-       RewriteCond %{HTTP_HOST} ^(.+)\.wikimaps\.com$
-       RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
-       # funnel        *wikimaps.net   //www.wikimedia.org
-       RewriteCond %{HTTP_HOST} =wikimaps.net
-       RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
-       # funnel        *wikimaps.net   //www.wikimedia.org
-       RewriteCond %{HTTP_HOST} ^(.+)\.wikimaps\.net$
-       RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
-       # funnel        *wikimaps.org   //www.wikimedia.org
-       RewriteCond %{HTTP_HOST} =wikimaps.org
-       RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
-       # funnel        *wikimaps.org   //www.wikimedia.org
-       RewriteCond %{HTTP_HOST} ^(.+)\.wikimaps\.org$
        RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
        # rewrite       *mediawiki.com  //www.mediawiki.org
        RewriteCond %{HTTP_HOST} =mediawiki.com
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 7ad29f1..b9ddc38 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -345,9 +345,6 @@
 # Random acquired cruft
 funnel *wikidisclosure.com     //www.wikimedia.org
 funnel *wikidisclosure.org     //www.wikimedia.org
-funnel *wikimaps.com   //www.wikimedia.org
-funnel *wikimaps.net   //www.wikimedia.org
-funnel *wikimaps.org   //www.wikimedia.org
 
 
 # Other projects

-- 
To view, visit https://gerrit.wikimedia.org/r/243348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ddfcbfdb9afef6517ec074e49ff94393d112dc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to