[ARVADOS] updated: 1.3.0-1472-g050ea7fdc

[Git user]

Summary of changes:
 sdk/python/tests/nginx.conf | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

       via  050ea7fdc6317a0fa0eeed20b0e6cb0b7fd6693b (commit)
      from  a33badcdc6af29a87d1f960dbff8ca947329a46b (commit)

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.


commit 050ea7fdc6317a0fa0eeed20b0e6cb0b7fd6693b
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Aug 8 15:47:03 2019 -0400

    14716: Remove Host header rewrite in integration test proxy config.
    
    Now that keep-web and Workbench see the same ExternalURL value in the
    cluster config file, Nginx needs to leave the Host header alone (like
    in production) instead of rewriting it to the fake value "download".
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf
index a7b8bacdc..6010ee4bf 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -78,30 +78,14 @@ http {
     ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://keep-web;
+      proxy_set_header Host $http_host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
+      proxy_redirect off;
 
       client_max_body_size 0;
       proxy_http_version 1.1;
       proxy_request_buffering off;
-
-      # Unlike other proxy sections, here we need to override the
-      # requested Host header and use proxy_redirect because of the
-      # way the test suite orchestrates services. Keep-web's "download
-      # only" behavior relies on the Host header matching a configured
-      # value, but when run_test_servers.py writes keep-web's command
-      # line, the keep-web-dl TLS port (which clients will connect to
-      # and include in their Host header) has not yet been assigned.
-      #
-      # In production, "proxy_set_header Host $http_host;
-      # proxy_redirect off;" works: keep-web's redirect URLs will
-      # match the request URL received by Nginx.
-      #
-      # Here, keep-web will issue redirects to https://download/ and
-      # Nginx will rewrite them.
-      #
-      proxy_set_header Host  download;
-      proxy_redirect https://download/ https://$host:{{KEEPWEBDLSSLPORT}}/;
     }
   }
   upstream ws {

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


hooks/post-receive
--