Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67351
Change subject: Move/redirect arbcom.XX wikis to arbcom-XX
......................................................................
Move/redirect arbcom.XX wikis to arbcom-XX
Also redirect wg.en.wikipedia.org and noboards.chapters.wikimedia.org
Change-Id: Ib81bc9a3fa5658652b5a40a0943b97eddb3cfeaa
---
M redirects.conf
M remnant.conf
M wikimedia.conf
3 files changed, 20 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config
refs/changes/51/67351/1
diff --git a/redirects.conf b/redirects.conf
index f071e9a..2a79a11 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -299,6 +299,12 @@
RewriteCond %{HTTP_HOST} ^pa\.us\.wikimedia\.org$
RewriteRule ^(.*)$ http://pa-us.wikimedia.org$1 [R=301,L,NE]
+ RewriteCond %{HTTP_HOST} ^noboard\.chapters\.wikimedia\.org$
+ RewriteRule ^(.*)$ http://noboard-chapters.wikimedia.org$1 [R=301,L,NE]
+
+ RewriteCond %{HTTP_HOST} ^wg\.en\.wikipedia\.org$
+ RewriteRule ^(.*)$ http://wg-en.wikipedia.org$1 [R=301,L,NE]
+
RewriteCond %{HTTP_HOST} =tp.wikipedia.org
RewriteRule ^(.*)$ http://tokipona.wikipedia.org$1 [R=301,L,NE]
diff --git a/remnant.conf b/remnant.conf
index 8929103..fca7118 100644
--- a/remnant.conf
+++ b/remnant.conf
@@ -986,11 +986,14 @@
#ArbCom_DE Wiki
<VirtualHost *>
DocumentRoot "/usr/local/apache/common/docroot/arbcom_dewiki"
- ServerName arbcom.de.wikimedia.org
+ ServerName arbcom-de.wikimedia.org
AllowEncodedSlashes On
RewriteEngine On
+
+ RewriteCond %{HTTP_HOST} ^arbcom\.de\.wikimedia\.org$
+ RewriteRule ^(.*)$ http://arbcom-de.wikimedia.org$1 [R=301,L,NE]
# Primary wiki redirector:
Alias /wiki /usr/local/apache/common/docroot/arbcom_dewiki/w/index.php
@@ -1021,11 +1024,15 @@
#arbcom_nlwiki Wiki
<VirtualHost *>
DocumentRoot "/usr/local/apache/common/docroot/arbcom_nlwiki"
- ServerName arbcom.de.wikimedia.org
+ ServerName arbcom-nl.wikimedia.org
AllowEncodedSlashes On
RewriteEngine On
+
+ RewriteCond %{HTTP_HOST} ^arbcom\.nl\.wikimedia\.org$
+ RewriteRule ^(.*)$ http://arbcom-nl.wikimedia.org$1 [R=301,L,NE]
+
# Primary wiki redirector:
Alias /wiki /usr/local/apache/common/docroot/arbcom_nlwiki/w/index.php
@@ -1459,12 +1466,15 @@
#arbcom_fiwiki Wiki
<VirtualHost *>
DocumentRoot "/usr/local/apache/common/docroot/arbcom_fiwiki"
- ServerName arbcom.fi.wikimedia.org
+ ServerName arbcom-fi.wikimedia.org
AllowEncodedSlashes On
RewriteEngine On
+ RewriteCond %{HTTP_HOST} ^arbcom\.fi\.wikimedia\.org$
+ RewriteRule ^(.*)$ http://arbcom-fi.wikimedia.org$1 [R=301,L,NE]
+
# Primary wiki redirector:
Alias /wiki /usr/local/apache/common/docroot/arbcom_fiwiki/w/index.php
RewriteRule ^/$ /w/index.php
diff --git a/wikimedia.conf b/wikimedia.conf
index 5e08702..6e63ad3 100644
--- a/wikimedia.conf
+++ b/wikimedia.conf
@@ -29,7 +29,7 @@
# Chapter wikis
<VirtualHost *>
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 uk.wikimedia.org us.wikimedia.org se.wikimedia.org
ru.wikimedia.org ua.wikimedia.org co.wikimedia.org fi.wikimedia.org
ve.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
+ 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 uk.wikimedia.org us.wikimedia.org se.wikimedia.org
ru.wikimedia.org ua.wikimedia.org co.wikimedia.org fi.wikimedia.org
ve.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
UseCanonicalName off
DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
--
To view, visit https://gerrit.wikimedia.org/r/67351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib81bc9a3fa5658652b5a40a0943b97eddb3cfeaa
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
