Mark Bergsma has submitted this change and it was merged.

Change subject: Revert "Revert "Apache config for legalteamwiki""
......................................................................


Revert "Revert "Apache config for legalteamwiki""

This reverts commit b69a14c5751beea731078899cd61ac237d9eff6b.

Change-Id: I5af610401ce939269619aa490c796664e5fce982
---
M wikimedia.conf
1 file changed, 32 insertions(+), 0 deletions(-)

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikimedia.conf b/wikimedia.conf
index 2cc33c1..e851bd6 100644
--- a/wikimedia.conf
+++ b/wikimedia.conf
@@ -188,6 +188,38 @@
     </Directory>
 </VirtualHost>
 
+# legalteamwiki bugzilla:61222
+<VirtualHost *>
+    DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org"
+    ServerName legalteam.wikimedia.org
+
+    AllowEncodedSlashes On
+
+    RewriteEngine On
+    RewriteCond %{HTTP:X-Forwarded-Proto} !https
+    RewriteRule ^/(.*)$ https://legalteam.wikimedia.org/$1 [R=301,L]
+
+    # Primary wiki redirector:
+    Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
+    RewriteRule ^/$ /w/index.php
+
+    RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+    # Configurable favicon
+    RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+
+    <Directory "/usr/local/apache/common/docroot/wikimedia.org/w">
+        <IfModule mod_php5.c>
+            php_admin_flag engine on
+        </IfModule>
+    </Directory>
+    <Directory "/usr/local/apache/common/docroot/wikimedia.org/w/extensions">
+        <IfModule mod_php5.c>
+            php_admin_flag engine off
+        </IfModule>
+    </Directory>
+</VirtualHost>
+
 <VirtualHost *>
     ServerName wikimedia.org
     Redirect permanent / http://www.wikimedia.org/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5af610401ce939269619aa490c796664e5fce982
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to