BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/237191
Change subject: Remove redirects for www.(meta|commons), pa.us ...................................................................... Remove redirects for www.(meta|commons), pa.us Bug: T102826 Change-Id: I568c656be5654ac7d4e88c4186c6c82592da5960 --- M modules/mediawiki/files/apache/sites/redirects.conf M modules/mediawiki/files/apache/sites/redirects/redirects.dat 2 files changed, 0 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/91/237191/1 diff --git a/modules/mediawiki/files/apache/sites/redirects.conf b/modules/mediawiki/files/apache/sites/redirects.conf index 8ac91e7..95497b4 100644 --- a/modules/mediawiki/files/apache/sites/redirects.conf +++ b/modules/mediawiki/files/apache/sites/redirects.conf @@ -275,7 +275,6 @@ ServerAlias nb.wikisource.org ServerAlias nb.wikinews.org ServerAlias nb.wikiversity.org - ServerAlias pa.us.wikimedia.org ServerAlias noboard.chapters.wikimedia.org ServerAlias chapcom.wikimedia.org ServerAlias be-x-old.wikipedia.org @@ -321,12 +320,8 @@ ServerAlias voyagewiki.com ServerAlias voyagewiki.org ServerAlias commons.wikipedia.org - ServerAlias www.commons.wikimedia.org - ServerAlias www.commons.wikipedia.org ServerAlias bookshelf.wikimedia.org ServerAlias meta.wikipedia.org - ServerAlias www.meta.wikipedia.org - ServerAlias www.meta.wikimedia.org ServerAlias quality.wikipedia.org ServerAlias quality.wikipedia.com ServerAlias bugzilla.wikipedia.org @@ -653,9 +648,6 @@ # funnel nb.wikiversity.org //beta.wikiversity.org/wiki/Hovedside RewriteCond %{HTTP_HOST} =nb.wikiversity.org RewriteRule . %{ENV:RW_PROTO}://beta.wikiversity.org/wiki/Hovedside [R=301,L,NE] - # rewrite pa.us.wikimedia.org //pa-us.wikimedia.org - RewriteCond %{HTTP_HOST} =pa.us.wikimedia.org - RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://pa-us.wikimedia.org$0 [R=301,L,NE] # rewrite noboard.chapters.wikimedia.org //noboard-chapters.wikimedia.org RewriteCond %{HTTP_HOST} =noboard.chapters.wikimedia.org RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://noboard-chapters.wikimedia.org$0 [R=301,L,NE] @@ -794,23 +786,11 @@ # rewrite commons.wikipedia.org //commons.wikimedia.org RewriteCond %{HTTP_HOST} =commons.wikipedia.org RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0 [R=301,L,NE] - # rewrite www.commons.wikimedia.org //commons.wikimedia.org - RewriteCond %{HTTP_HOST} =www.commons.wikimedia.org - RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0 [R=301,L,NE] - # rewrite www.commons.wikipedia.org //commons.wikimedia.org - RewriteCond %{HTTP_HOST} =www.commons.wikipedia.org - RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0 [R=301,L,NE] # rewrite bookshelf.wikimedia.org //outreach.wikimedia.org/wiki/Bookshelf/ RewriteCond %{HTTP_HOST} =bookshelf.wikimedia.org RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://outreach.wikimedia.org/wiki/Bookshelf$0 [R=301,L,NE] # rewrite meta.wikipedia.org //meta.wikimedia.org RewriteCond %{HTTP_HOST} =meta.wikipedia.org - RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://meta.wikimedia.org$0 [R=301,L,NE] - # rewrite www.meta.wikipedia.org //meta.wikimedia.org - RewriteCond %{HTTP_HOST} =www.meta.wikipedia.org - RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://meta.wikimedia.org$0 [R=301,L,NE] - # rewrite www.meta.wikimedia.org //meta.wikimedia.org - RewriteCond %{HTTP_HOST} =www.meta.wikimedia.org RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://meta.wikimedia.org$0 [R=301,L,NE] # rewrite quality.wikipedia.org //quality.wikimedia.org RewriteCond %{HTTP_HOST} =quality.wikipedia.org diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat b/modules/mediawiki/files/apache/sites/redirects/redirects.dat index 4357146..143cfb4 100644 --- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat +++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat @@ -96,7 +96,6 @@ funnel nb.wikiversity.org //beta.wikiversity.org/wiki/Hovedside # renamed chapter wiki - T40763 -rewrite pa.us.wikimedia.org //pa-us.wikimedia.org rewrite noboard.chapters.wikimedia.org //noboard-chapters.wikimedia.org rewrite chapcom.wikimedia.org https://affcom.wikimedia.org @@ -339,8 +338,6 @@ rewrite *wikimediacommons.co.uk //commons.wikimedia.org rewrite commons.wikipedia.org //commons.wikimedia.org -rewrite www.commons.wikimedia.org //commons.wikimedia.org -rewrite www.commons.wikipedia.org //commons.wikimedia.org # Bookshelf Project rewrite bookshelf.wikimedia.org //outreach.wikimedia.org/wiki/Bookshelf/ @@ -356,8 +353,6 @@ # Other projects rewrite meta.wikipedia.org //meta.wikimedia.org -rewrite www.meta.wikipedia.org //meta.wikimedia.org -rewrite www.meta.wikimedia.org //meta.wikimedia.org rewrite quality.wikipedia.org //quality.wikimedia.org rewrite quality.wikipedia.com //quality.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/237191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I568c656be5654ac7d4e88c4186c6c82592da5960 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <bbl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits