BBlack has submitted this change and it was merged.
Change subject: Remove redirects for www.nl, noboard.chapters
......................................................................
Remove redirects for www.nl, noboard.chapters
Bug: T102826
Change-Id: I2a404c70123e312dc5b2fbe299412533bfcf490d
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
M modules/mediawiki/files/apache/sites/wikimedia.conf
3 files changed, 1 insertion(+), 6 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 95497b4..4c25a2c 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 noboard.chapters.wikimedia.org
ServerAlias chapcom.wikimedia.org
ServerAlias be-x-old.wikipedia.org
ServerAlias zh-cfr.wikipedia.org
@@ -648,9 +647,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 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]
# rewrite chapcom.wikimedia.org https://affcom.wikimedia.org
RewriteCond %{HTTP_HOST} =chapcom.wikimedia.org
RewriteRule ^[^\x00-\x1F]* https://affcom.wikimedia.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 143cfb4..69f4409 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 noboard.chapters.wikimedia.org //noboard-chapters.wikimedia.org
rewrite chapcom.wikimedia.org https://affcom.wikimedia.org
diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf
b/modules/mediawiki/files/apache/sites/wikimedia.conf
index 302b3b6..b8f02eb 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -2,7 +2,7 @@
# Local user groups assimilated by AffCom to chapters are also added in this
vhost.
<VirtualHost *:80>
ServerName wikimedia-chapter
- ServerAlias no.wikimedia.org nl.wikimedia.org www.nl.wikimedia.org
pl.wikimedia.org nz.wikimedia.org il.wikimedia.org rs.wikimedia.org
pa-us.wikimedia.org us.wikimedia.org se.wikimedia.org ru.wikimedia.org
ua.wikimedia.org co.wikimedia.org fi.wikimedia.org br.wikimedia.org
dk.wikimedia.org tr.wikimedia.org noboard-chapters.wikimedia.org
mk.wikimedia.org et.wikimedia.org nyc.wikimedia.org mx.wikimedia.org
ar.wikimedia.org bd.wikimedia.org be.wikimedia.org ca.wikimedia.org
cn.wikimedia.org
+ ServerAlias no.wikimedia.org nl.wikimedia.org pl.wikimedia.org
nz.wikimedia.org il.wikimedia.org rs.wikimedia.org pa-us.wikimedia.org
us.wikimedia.org se.wikimedia.org ru.wikimedia.org ua.wikimedia.org
co.wikimedia.org fi.wikimedia.org br.wikimedia.org dk.wikimedia.org
tr.wikimedia.org noboard-chapters.wikimedia.org mk.wikimedia.org
et.wikimedia.org nyc.wikimedia.org mx.wikimedia.org ar.wikimedia.org
bd.wikimedia.org be.wikimedia.org ca.wikimedia.org cn.wikimedia.org
UseCanonicalName off
RewriteEngine On
--
To view, visit https://gerrit.wikimedia.org/r/237192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a404c70123e312dc5b2fbe299412533bfcf490d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
