[ARVADOS] updated: 1.1.4-380-g21c5372c6

[Git user]

Summary of changes:
 sdk/python/tests/nginx.conf         | 28 ++++++++++++++--------------
 sdk/python/tests/run_test_server.py |  1 +
 2 files changed, 15 insertions(+), 14 deletions(-)

       via  21c5372c6b670820e842e01336eb6b191d6e10b7 (commit)
       via  4a98eba9ae08ffccb822842f74b1b805302a1ad1 (commit)
      from  e26dc8ebc182bec997624213c771f06e9b0179e8 (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 21c5372c6b670820e842e01336eb6b191d6e10b7
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Jun 14 17:03:24 2018 -0400

    13497: Quote file paths in test suite nginx.conf.
    
    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 ce1b17062..ce1929fdf 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -7,7 +7,7 @@ error_log "{{ERRORLOG}}" info;          # Yes, must be specified here _and_ cmdl
 events {
 }
 http {
-  access_log {{ACCESSLOG}} combined;
+  access_log "{{ACCESSLOG}}" combined;
   client_body_temp_path "{{TMPDIR}}";
   upstream arv-git-http {
     server localhost:{{GITPORT}};
@@ -15,8 +15,8 @@ http {
   server {
     listen *:{{GITSSLPORT}} ssl default_server;
     server_name _;
-    ssl_certificate {{SSLCERT}};
-    ssl_certificate_key {{SSLKEY}};
+    ssl_certificate "{{SSLCERT}}";
+    ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://arv-git-http;
     }
@@ -27,8 +27,8 @@ http {
   server {
     listen *:{{KEEPPROXYSSLPORT}} ssl default_server;
     server_name _;
-    ssl_certificate {{SSLCERT}};
-    ssl_certificate_key {{SSLKEY}};
+    ssl_certificate "{{SSLCERT}}";
+    ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://keepproxy;
     }
@@ -39,8 +39,8 @@ http {
   server {
     listen *:{{KEEPWEBSSLPORT}} ssl default_server;
     server_name ~^(?<request_host>.*)$;
-    ssl_certificate {{SSLCERT}};
-    ssl_certificate_key {{SSLKEY}};
+    ssl_certificate "{{SSLCERT}}";
+    ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://keep-web;
       proxy_set_header Host $request_host:{{KEEPWEBPORT}};
@@ -50,8 +50,8 @@ http {
   server {
     listen *:{{KEEPWEBDLSSLPORT}} ssl default_server;
     server_name ~.*;
-    ssl_certificate {{SSLCERT}};
-    ssl_certificate_key {{SSLKEY}};
+    ssl_certificate "{{SSLCERT}}";
+    ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://keep-web;
       proxy_set_header Host download:{{KEEPWEBPORT}};
@@ -65,8 +65,8 @@ http {
   server {
     listen *:{{WSSPORT}} ssl default_server;
     server_name ~^(?<request_host>.*)$;
-    ssl_certificate {{SSLCERT}};
-    ssl_certificate_key {{SSLKEY}};
+    ssl_certificate "{{SSLCERT}}";
+    ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://ws;
       proxy_set_header Upgrade $http_upgrade;
@@ -81,8 +81,8 @@ http {
   server {
     listen *:{{CONTROLLERSSLPORT}} ssl default_server;
     server_name _;
-    ssl_certificate {{SSLCERT}};
-    ssl_certificate_key {{SSLKEY}};
+    ssl_certificate "{{SSLCERT}}";
+    ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://controller;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

commit 4a98eba9ae08ffccb822842f74b1b805302a1ad1
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Jun 14 17:02:10 2018 -0400

    13497: Suppress nginx "info" logs from console.
    
    (unless ARVADOS_DEBUG is set)
    
    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 bda67e630..ce1b17062 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 daemon off;
-error_log stderr info;          # Yes, must be specified here _and_ cmdline
+error_log "{{ERRORLOG}}" info;          # Yes, must be specified here _and_ cmdline
 events {
 }
 http {
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 258cc38d6..dc4d721f1 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -666,6 +666,7 @@ def run_nginx():
     nginxconf['SSLCERT'] = os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'self-signed.pem')
     nginxconf['SSLKEY'] = os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'self-signed.key')
     nginxconf['ACCESSLOG'] = _logfilename('nginx_access')
+    nginxconf['ERRORLOG'] = _logfilename('nginx_error')
     nginxconf['TMPDIR'] = TEST_TMPDIR
 
     conftemplatefile = os.path.join(MY_DIRNAME, 'nginx.conf')

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


hooks/post-receive
--