Reedy has uploaded a new change for review.

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


Change subject: Move "RewriteEngine On" earlier in www.wikimedia.org vhost
......................................................................

Move "RewriteEngine On" earlier in www.wikimedia.org vhost

Fix indenting in jobs

Change-Id: I039c8f1298f57b0484579327eff8ebf7beee1b60
---
M wikimedia.conf
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/wikimedia.conf b/wikimedia.conf
index fe89091..0112607 100644
--- a/wikimedia.conf
+++ b/wikimedia.conf
@@ -197,12 +197,12 @@
 # job.w.o
 # #
 <VirtualHost *>
-       ServerName jobs.wikimedia.org
-       ServerAlias careers.wikimedia.org
+ServerName jobs.wikimedia.org
+    ServerAlias careers.wikimedia.org
 
-        RewriteEngine On
-       RewriteRule ^/$         http://wikimediafoundation.org/wiki/Work_with_us
-        RewriteRule ^/(.*)$     
http://wikimediafoundation.org/wiki/Job_openings/$1
+    RewriteEngine On
+    RewriteRule ^/$ http://wikimediafoundation.org/wiki/Work_with_us
+    RewriteRule ^/(.*)$ http://wikimediafoundation.org/wiki/Job_openings/$1
 </VirtualHost>
 
 <VirtualHost *>
@@ -212,10 +212,11 @@
 
 # wikimedia.org
 <VirtualHost *>
-#    DocumentRoot "/usr/local/apache/htdocs/wikimedia"
     DocumentRoot "/usr/local/apache/common/docroot/www.wikimedia.org"
     ServerName www.wikimedia.org
     ServerAlias *.wikimedia.org
+
+    RewriteEngine On
 
     # Main page portal
     RewriteRule ^/$ 
/w/extract2.php?title=Www.wikimedia.org_portal&template=Www.wikimedia.org_template
 [L]
@@ -229,7 +230,6 @@
     ExpiresActive On
 
     # Redirect wiki which was previously at this location
-    RewriteEngine On
     RewriteRule ^/wiki/(.*)$ http://wikimediafoundation.org/wiki/$1 [R=301,L]
 
   <Directory "/usr/local/apache/common/docroot/www.wikimedia.org/w">

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I039c8f1298f57b0484579327eff8ebf7beee1b60
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

Reply via email to