[mb-commits] branch, pino-beta, updated. MBH-298, when rewriting urls, use the scheme sent by the load balancer instea...

The branch, pino-beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b62fc51c65c6e8ce127ebd6caa4dcb86f5eb5d7f (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c8b8ceafca36c285d975e8054c20c87efcbd09f7 (commit)

Summary of changes:
 admin/nginx/mbserver-rewrites.conf |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b62fc51c65c6e8ce127ebd6caa4dcb86f5eb5d7f
Author: warp <[email protected]>
Date:   Fri Jan 18 10:35:50 2013 +0000

    MBH-298, when rewriting urls, use the scheme sent by the load balancer instead of our local scheme.

diff --git a/admin/nginx/mbserver-rewrites.conf b/admin/nginx/mbserver-rewrites.conf
index 03966b8..fb9f78f 100644
--- a/admin/nginx/mbserver-rewrites.conf
+++ b/admin/nginx/mbserver-rewrites.conf
@@ -14,12 +14,17 @@ if ($uri !~ "^/ws/") {
 }
 
 if ($not_canonical = HGWS) {
-    rewrite ^/(.*)$ $scheme://musicbrainz.org/$1 permanent;
+    rewrite ^/(.*)$ $lb_scheme://musicbrainz.org/$1 permanent;
+}
+
+set $lb_scheme "http";
+if ($http_x_mb_https = on) {
+    set $lb_scheme "https";
 }
 
 set $mb_server "";
 if ($http_host = beta.musicbrainz.org) {
-    set $mb_server "$scheme://beta.musicbrainz.org";
+    set $mb_server "$lb_scheme://beta.musicbrainz.org";
 }
 
 # Pages on other host thingies
@@ -29,7 +34,7 @@ rewrite ^/sponsors\.html$                http://metabrainz.org/donate/sponsors.h
 rewrite ^/archives/irc/musicbrainz/(.*)$ http://chatlogs.musicbrainz.org/$1                                        permanent;
 rewrite ^/archives/irc                   http://chatlogs.musicbrainz.org/                                          permanent;
 rewrite ^/pipermail(/|$)                 http://lists.musicbrainz.org/                                             permanent;
-rewrite ^/cgi-bin/wiki/(.*)              $scheme://wiki.musicbrainz.org/$1                                         permanent;
+rewrite ^/cgi-bin/wiki/(.*)              $lb_scheme://wiki.musicbrainz.org/$1                                         permanent;
 rewrite ^/mrtg(|/.*)$                    http://stats.musicbrainz.org/mrtg$1                                       permanent;
 rewrite ^/usage(|/.*)$                   http://stats.musicbrainz.org/webstats$1                                   permanent;
 rewrite ^/bugs$                          http://jira.musicbrainz.org/                                              ;

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server