Dzahn has uploaded a new change for review.

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

Change subject: apache: remove softwarewikipedia redirects
......................................................................

apache: remove softwarewikipedia redirects

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/243342/1

diff --git a/modules/mediawiki/files/apache/sites/redirects.conf 
b/modules/mediawiki/files/apache/sites/redirects.conf
index 412c374..e0473eb 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -185,12 +185,6 @@
        ServerAlias *.wikimaps.org
        ServerAlias mediawiki.com
        ServerAlias *.mediawiki.com
-       ServerAlias softwarewikipedia.com
-       ServerAlias *.softwarewikipedia.com
-       ServerAlias softwarewikipedia.net
-       ServerAlias *.softwarewikipedia.net
-       ServerAlias softwarewikipedia.org
-       ServerAlias *.softwarewikipedia.org
        ServerAlias wikimania.org
        ServerAlias *.wikimania.org
        ServerAlias wikimania.com
@@ -1468,24 +1462,6 @@
        RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.mediawiki.org$0 
[R=301,L,NE]
        # rewrite       *mediawiki.com  //www.mediawiki.org
        RewriteCond %{HTTP_HOST} ^(.+)\.mediawiki\.com$
-       RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.mediawiki.org$0 
[R=301,L,NE]
-       # rewrite       *softwarewikipedia.com  //www.mediawiki.org
-       RewriteCond %{HTTP_HOST} =softwarewikipedia.com
-       RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.mediawiki.org$0 
[R=301,L,NE]
-       # rewrite       *softwarewikipedia.com  //www.mediawiki.org
-       RewriteCond %{HTTP_HOST} ^(.+)\.softwarewikipedia\.com$
-       RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.mediawiki.org$0 
[R=301,L,NE]
-       # rewrite       *softwarewikipedia.net  //www.mediawiki.org
-       RewriteCond %{HTTP_HOST} =softwarewikipedia.net
-       RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.mediawiki.org$0 
[R=301,L,NE]
-       # rewrite       *softwarewikipedia.net  //www.mediawiki.org
-       RewriteCond %{HTTP_HOST} ^(.+)\.softwarewikipedia\.net$
-       RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.mediawiki.org$0 
[R=301,L,NE]
-       # rewrite       *softwarewikipedia.org  //www.mediawiki.org
-       RewriteCond %{HTTP_HOST} =softwarewikipedia.org
-       RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.mediawiki.org$0 
[R=301,L,NE]
-       # rewrite       *softwarewikipedia.org  //www.mediawiki.org
-       RewriteCond %{HTTP_HOST} ^(.+)\.softwarewikipedia\.org$
        RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.mediawiki.org$0 
[R=301,L,NE]
        # rewrite       *wikimania.org  //wikimania2015.wikimedia.org
        RewriteCond %{HTTP_HOST} =wikimania.org
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 7ad29f1..13f6749 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -372,10 +372,6 @@
 funnel docs.mediawiki.org      https://doc.wikimedia.org
 funnel docs.wikimedia.org      https://doc.wikimedia.org
 
-rewrite        *softwarewikipedia.com  //www.mediawiki.org
-rewrite        *softwarewikipedia.net  //www.mediawiki.org
-rewrite        *softwarewikipedia.org  //www.mediawiki.org
-
 rewrite        nostalgia.wikimedia.org //nostalgia.wikipedia.org
 
 rewrite        mail.wikipedia.org      https://lists.wikimedia.org

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

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