Reedy has uploaded a new change for review.

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


Change subject: loginwiki v2
......................................................................

loginwiki v2

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


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

diff --git a/wikimedia.conf b/wikimedia.conf
index 3793e13..df977d1 100644
--- a/wikimedia.conf
+++ b/wikimedia.conf
@@ -261,24 +261,27 @@
     AllowEncodedSlashes On
 
     RewriteEngine On
-    RewriteCond %{HTTP:X-Forwarded-Proto} !https
-    RewriteRule ^/(.*)$ https://login.wikimedia.org/$1 [R=301,L]
 
     # Primary wiki redirector:
     Alias /wiki /usr/local/apache/common/docroot/login/w/index.php
     RewriteRule ^/$ /w/index.php
+
+    RewriteRule ^/math/(.*) http://upload.wikimedia.org/math/$1 [R=301]
+
+    # Uploads are offsite
+    RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikipedia/login/$1 
[R=302]
 
     # Configurable favicon
     RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
 
     <Directory "/usr/local/apache/common/docroot/login/w">
         <IfModule mod_php5.c>
-            php_admin_flag engine on
+          php_admin_flag engine on
         </IfModule>
     </Directory>
     <Directory "/usr/local/apache/common/docroot/login/w/extensions">
         <IfModule mod_php5.c>
-            php_admin_flag engine off
+          php_admin_flag engine off
         </IfModule>
     </Directory>
 </VirtualHost>

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

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