[MediaWiki-commits] [Gerrit] remove en2.wikipedia.org from redirects - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: remove en2.wikipedia.org from redirects
..

remove en2.wikipedia.org from redirects

It was already removed from DNS in I85104f7156b3edf so this is
just cleanup as requested in T105981

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/224989/1

diff --git a/modules/mediawiki/files/apache/sites/redirects.conf 
b/modules/mediawiki/files/apache/sites/redirects.conf
index bb95b4e..5802f1f 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -293,7 +293,6 @@
ServerAlias www.wikipedia.com
ServerAlias www.wikipedia.net
ServerAlias en.wikipedia.com
-   ServerAlias en2.wikipedia.org
ServerAlias wikipaedia.net
ServerAlias wiki-pedia.org
ServerAlias wiktionary.com
@@ -703,9 +702,6 @@
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikipedia.org$0 
[R=301,L,NE]
# rewrite   en.wikipedia.com//en.wikipedia.org
RewriteCond %{HTTP_HOST} =en.wikipedia.com
-   RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0 
[R=301,L,NE]
-   # rewrite   en2.wikipedia.org   //en.wikipedia.org
-   RewriteCond %{HTTP_HOST} =en2.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0 
[R=301,L,NE]
# rewrite   wikipaedia.net  //www.wikipedia.org
RewriteCond %{HTTP_HOST} =wikipaedia.net
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 236f1c5..f2258f6 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -211,7 +211,6 @@
 rewritewww.wikipedia.net   //www.wikipedia.org
 
 rewriteen.wikipedia.com//en.wikipedia.org
-rewriteen2.wikipedia.org   //en.wikipedia.org
 
 rewrite*wikipedia.co.uk//en.wikipedia.org
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] remove en2.wikipedia.org from redirects - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: remove en2.wikipedia.org from redirects
..


remove en2.wikipedia.org from redirects

It was already removed from DNS in I85104f7156b3edf so this is
just cleanup as requested in T105981

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

Approvals:
  John F. Lewis: Looks good to me, but someone else must approve
  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 bb95b4e..5802f1f 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -293,7 +293,6 @@
ServerAlias www.wikipedia.com
ServerAlias www.wikipedia.net
ServerAlias en.wikipedia.com
-   ServerAlias en2.wikipedia.org
ServerAlias wikipaedia.net
ServerAlias wiki-pedia.org
ServerAlias wiktionary.com
@@ -703,9 +702,6 @@
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikipedia.org$0 
[R=301,L,NE]
# rewrite   en.wikipedia.com//en.wikipedia.org
RewriteCond %{HTTP_HOST} =en.wikipedia.com
-   RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0 
[R=301,L,NE]
-   # rewrite   en2.wikipedia.org   //en.wikipedia.org
-   RewriteCond %{HTTP_HOST} =en2.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0 
[R=301,L,NE]
# rewrite   wikipaedia.net  //www.wikipedia.org
RewriteCond %{HTTP_HOST} =wikipaedia.net
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 236f1c5..f2258f6 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -211,7 +211,6 @@
 rewritewww.wikipedia.net   //www.wikipedia.org
 
 rewriteen.wikipedia.com//en.wikipedia.org
-rewriteen2.wikipedia.org   //en.wikipedia.org
 
 rewrite*wikipedia.co.uk//en.wikipedia.org
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: MZMcBride w...@mzmcbride.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits