QChris has uploaded a new change for review.

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


Change subject: Switch apache's reverse proxy config for gerrit back to 
ProxyPass
......................................................................

Switch apache's reverse proxy config for gerrit back to ProxyPass

When trying to add users whose email addresses contained “+” to groups
in gerrit, apache changed the encoded “+” to a plain “+” in the PUT
Urls, which caused gerrit to not find the member in question, and
gerrit failed to add such users to groups.

We switch to the new suggested reverse proxy configuration provided by
Gerrit, which circumvents this problem.

Change-Id: Ifc88824cb1a83ba6ef4f0e9962f09f5d3368ea56
---
M templates/apache/sites/gerrit.wikimedia.org.erb
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/71244/1

diff --git a/templates/apache/sites/gerrit.wikimedia.org.erb 
b/templates/apache/sites/gerrit.wikimedia.org.erb
index d52fecf..9356191 100644
--- a/templates/apache/sites/gerrit.wikimedia.org.erb
+++ b/templates/apache/sites/gerrit.wikimedia.org.erb
@@ -87,11 +87,12 @@
                deny from env=bad_browser
        </Proxy>
 
-       AllowEncodedSlashes NoDecode
+       AllowEncodedSlashes On
        RewriteEngine On
        RewriteCond %{QUERY_STRING} 
^p=mediawiki/core\.git;a=blob_plain;f=languages/messages/([a-zA-Z_]+)\.php;hb=HEAD$
        RewriteRule ^/r/gitweb$ 
https://git.wikimedia.org/raw/mediawiki\%2Fcore.git/HEAD/languages\%2Fmessages\%2F%1.php
 [R=301,L,NE]
-       RewriteRule ^/r/(.*) http://127.0.0.1:8080/r/$1 [NE,P]
+
+       ProxyPass /r/ http://127.0.0.1:8080/r/ retry=0 nocanon
 
        ErrorLog /var/log/apache2/error.log
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc88824cb1a83ba6ef4f0e9962f09f5d3368ea56
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to