Jeremyb has uploaded a new change for review.

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

Change subject: fix cert mismatch on mail.wikipedia.org
......................................................................

fix cert mismatch on mail.wikipedia.org

this must be deployed before the DNS change
( I152ca6447dccfb7542d2f5bbc8522d179d570a4b )

Bug: 44731
RT:  6981
Change-Id: I5e6abc5fcb7ecc34764b0f559189c964b5df0de7
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/154223/1

diff --git a/modules/mediawiki/files/apache/sites/redirects.conf 
b/modules/mediawiki/files/apache/sites/redirects.conf
index 6946e93..6e62dfc 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -355,6 +355,7 @@
        doc.mediawiki.org \
        integration.mediawiki.org \
        nostalgia.wikimedia.org \
+       mail.wikipedia.org \
        mediawiki.org \
        wikimedia.org \
        wikinews.org \
@@ -897,6 +898,9 @@
        # rewrite       nostalgia.wikimedia.org //nostalgia.wikipedia.org
        RewriteCond %{HTTP_HOST} =nostalgia.wikimedia.org
        RewriteRule .* %{ENV:RW_PROTO}://nostalgia.wikipedia.org$0 [R=301,L,NE]
+       # rewrite       mail.wikipedia.org      //lists.wikimedia.org
+       RewriteCond %{HTTP_HOST} =mail.wikipedia.org
+       RewriteRule .* %{ENV:RW_PROTO}://lists.wikimedia.org$0 [R=301,L,NE]
        # rewrite       mediawiki.org   //www.mediawiki.org
        RewriteCond %{HTTP_HOST} =mediawiki.org
        RewriteRule .* %{ENV:RW_PROTO}://www.mediawiki.org$0 [R=301,L,NE]
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 1996c8d..b73816e 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -410,6 +410,8 @@
 
 rewrite        nostalgia.wikimedia.org //nostalgia.wikipedia.org
 
+rewrite        mail.wikipedia.org      //lists.wikimedia.org
+
 ###############
 ## projects
 ###############

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e6abc5fcb7ecc34764b0f559189c964b5df0de7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jeremyb <jer...@tuxmachine.com>

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

Reply via email to