Dzahn has uploaded a new change for review.

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

Change subject: apache: remove wikifamily redirects
......................................................................

apache: remove wikifamily redirects

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/243345/1

diff --git a/modules/mediawiki/files/apache/sites/redirects.conf 
b/modules/mediawiki/files/apache/sites/redirects.conf
index 412c374..ad7f098 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -107,10 +107,6 @@
        ServerAlias *.visualwikipedia.net
        ServerAlias webhostingwikipedia.com
        ServerAlias *.webhostingwikipedia.com
-       ServerAlias wikifamily.com
-       ServerAlias *.wikifamily.com
-       ServerAlias wikifamily.org
-       ServerAlias *.wikifamily.org
        ServerAlias wiikipedia.com
        ServerAlias *.wiikipedia.com
        ServerAlias wekipedia.com
@@ -1234,18 +1230,6 @@
        RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
        # funnel        *webhostingwikipedia.com        //www.wikipedia.org
        RewriteCond %{HTTP_HOST} ^(.+)\.webhostingwikipedia\.com$
-       RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
-       # funnel        *wikifamily.com //www.wikipedia.org
-       RewriteCond %{HTTP_HOST} =wikifamily.com
-       RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
-       # funnel        *wikifamily.com //www.wikipedia.org
-       RewriteCond %{HTTP_HOST} ^(.+)\.wikifamily\.com$
-       RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
-       # funnel        *wikifamily.org //www.wikipedia.org
-       RewriteCond %{HTTP_HOST} =wikifamily.org
-       RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
-       # funnel        *wikifamily.org //www.wikipedia.org
-       RewriteCond %{HTTP_HOST} ^(.+)\.wikifamily\.org$
        RewriteRule . %{ENV:RW_PROTO}://www.wikipedia.org/ [R=301,L,NE]
        # funnel        *wiikipedia.com //www.wikipedia.org
        RewriteCond %{HTTP_HOST} =wiikipedia.com
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 7ad29f1..ee488c5 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -227,8 +227,6 @@
 funnel *visualwikipedia.com    //www.wikipedia.org
 funnel *visualwikipedia.net    //www.wikipedia.org
 funnel *webhostingwikipedia.com        //www.wikipedia.org
-funnel *wikifamily.com //www.wikipedia.org
-funnel *wikifamily.org //www.wikipedia.org
 
 # wikipedia typo domains to www. instead of en - RT #4679,#4681
 funnel *wiikipedia.com //www.wikipedia.org

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e73c4de76ed65ab2e611354289bf2a2358a7bca
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