[MediaWiki-commits] [Gerrit] wg.en - wg-en and noboard.chapters - noboard-chapters - change (operations/apache-config)

2014-06-24 Thread Ori.livneh (Code Review) 
Ori.livneh has submitted this change and it was merged.

Change subject: wg.en - wg-en and noboard.chapters - noboard-chapters
..


wg.en - wg-en and noboard.chapters - noboard-chapters

Bug: 64977
Bug: 31335

Change-Id: Ifc9596cc7b48d8b145aed04ad0631d9b9e4aae8f
---
M redirects.conf
M redirects.dat
M wikimedia.conf
3 files changed, 13 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/redirects.conf b/redirects.conf
index e3eb328..5ef5900 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -290,6 +290,8 @@
arbcom.en.wikipedia.org \
arbcom.fi.wikipedia.org \
arbcom.nl.wikipedia.org \
+   noboard.chapters.wikimedia.org \
+   wg.en.wikipedia.org \
tp.wikipedia.org \
zh-cfr.wikipedia.org \
minnan.wikipedia.org \
@@ -696,6 +698,12 @@
# rewrite   arbcom.nl.wikipedia.org https://arbcom-nl.wikipedia.org
RewriteCond %{HTTP_HOST} =arbcom.nl.wikipedia.org
RewriteRule .* https://arbcom-nl.wikipedia.org$0 [R=301,L,NE]
+   # rewrite   noboard.chapters.wikimedia.org  
//noboard-chapters.wikimedia.org
+   RewriteCond %{HTTP_HOST} =noboard.chapters.wikimedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://noboard-chapters.wikimedia.org$0 
[R=301,L,NE]
+   # rewrite   wg.en.wikipedia.org //wg-en.wikipedia.org
+   RewriteCond %{HTTP_HOST} =wg.en.wikipedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://wg-en.wikipedia.org$0 [R=301,L,NE]
# rewrite   tp.wikipedia.org//tokipona.wikipedia.org
RewriteCond %{HTTP_HOST} =tp.wikipedia.org
RewriteRule .* %{ENV:RW_PROTO}://tokipona.wikipedia.org$0 [R=301,L,NE]
diff --git a/redirects.dat b/redirects.dat
index 28b49fa..b8dffb6 100644
--- a/redirects.dat
+++ b/redirects.dat
@@ -124,6 +124,10 @@
 rewritearbcom.fi.wikipedia.org https://arbcom-fi.wikipedia.org
 rewritearbcom.nl.wikipedia.org https://arbcom-nl.wikipedia.org
 
+rewritenoboard.chapters.wikimedia.org  //noboard-chapters.wikimedia.org
+
+rewritewg.en.wikipedia.org //wg-en.wikipedia.org
+
 rewritetp.wikipedia.org//tokipona.wikipedia.org
 
 rewritezh-cfr.wikipedia.org//zh-min-nan.wikipedia.org
diff --git a/wikimedia.conf b/wikimedia.conf
index 93094d0..ca7c04b 100644
--- a/wikimedia.conf
+++ b/wikimedia.conf
@@ -1,7 +1,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 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 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/134939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc9596cc7b48d8b145aed04ad0631d9b9e4aae8f
Gerrit-PatchSet: 5
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] wg.en - wg-en and noboard.chapters - noboard-chapters - change (operations/apache-config)

2014-05-22 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review.

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

Change subject: wg.en - wg-en and noboard.chapters - noboard-chapters
..

wg.en - wg-en and noboard.chapters - noboard-chapters

Change-Id: Ifc9596cc7b48d8b145aed04ad0631d9b9e4aae8f
---
M redirects.conf
M redirects.dat
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config 
refs/changes/39/134939/1

diff --git a/redirects.conf b/redirects.conf
index a93d841..1158592 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -286,6 +286,8 @@
jp.wikipedia.com \
nb.wikipedia.org \
pa.us.wikimedia.org \
+   noboard.chapters.wikimedia.org \
+   wg.en.wikipedia.org \
tp.wikipedia.org \
zh-cfr.wikipedia.org \
minnan.wikipedia.org \
@@ -681,6 +683,12 @@
# rewrite   pa.us.wikimedia.org //pa-us.wikimedia.org
RewriteCond %{HTTP_HOST} =pa.us.wikimedia.org
RewriteRule .* %{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 .* %{ENV:RW_PROTO}://noboard-chapters.wikimedia.org$0 
[R=301,L,NE]
+   # rewrite   wg.en.wikipedia.org //wg-en.wikipedia.org
+   RewriteCond %{HTTP_HOST} =wg.en.wikipedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://wg-en.wikipedia.org$0 [R=301,L,NE]
# rewrite   tp.wikipedia.org//tokipona.wikipedia.org
RewriteCond %{HTTP_HOST} =tp.wikipedia.org
RewriteRule .* %{ENV:RW_PROTO}://tokipona.wikipedia.org$0 [R=301,L,NE]
diff --git a/redirects.dat b/redirects.dat
index 0de1dee..6cd5fef 100644
--- a/redirects.dat
+++ b/redirects.dat
@@ -118,6 +118,10 @@
 # renamed chapter wiki - bug 38763
 rewritepa.us.wikimedia.org //pa-us.wikimedia.org
 
+rewritenoboard.chapters.wikimedia.org  //noboard-chapters.wikimedia.org
+
+rewritewg.en.wikipedia.org //wg-en.wikipedia.org
+
 rewritetp.wikipedia.org//tokipona.wikipedia.org
 
 rewritezh-cfr.wikipedia.org//zh-min-nan.wikipedia.org

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc9596cc7b48d8b145aed04ad0631d9b9e4aae8f
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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