[ARVADOS] updated: 1.3.0-1648-g6527c6437

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/cluster-config.sh | 13 +++++++++++++
 tools/arvbox/lib/arvbox/docker/keep-setup.sh     |  3 ---
 tools/arvbox/lib/arvbox/docker/service/nginx/run |  7 +++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

       via  6527c64378ebd1970be69f6502db181c8272da5a (commit)
       via  f5862345c56afa3ea3565db9e6e0edb365b9fa03 (commit)
      from  3cec8c10796bb6de9c02c96bbe7dd644c7366e42 (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 6527c64378ebd1970be69f6502db181c8272da5a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 25 17:15:11 2019 -0400

    13647: Migrate arvbox volume config.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index 95c137543..622871ac5 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -149,6 +149,19 @@ Clusters:
       GitCommand: /usr/share/gitolite3/gitolite-shell
       GitoliteHome: /var/lib/arvados/git
       Repositories: /var/lib/arvados/git/repositories
+    Volumes:
+      ${uuid_prefix}-nyw5e-000000000000000:
+        Driver: Directory
+        DriverParameters:
+          Root: /var/lib/arvados/keep0
+        AccessViaHosts:
+          "http://localhost:${services[keepstore0]}": {}
+      ${uuid_prefix}-nyw5e-111111111111111:
+        Driver: Directory
+        DriverParameters:
+          Root: /var/lib/arvados/keep1
+        AccessViaHosts:
+          "http://localhost:${services[keepstore1]}": {}
 EOF
 
 /usr/local/lib/arvbox/yml_override.py /var/lib/arvados/cluster_config.yml
diff --git a/tools/arvbox/lib/arvbox/docker/keep-setup.sh b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
index 7ac8454d9..0c4daec1b 100755
--- a/tools/arvbox/lib/arvbox/docker/keep-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
@@ -53,9 +53,6 @@ BlobSigningKeyFile: /var/lib/arvados/blob_signing_key
 SystemAuthTokenFile: /var/lib/arvados/superuser_token
 ManagementToken: $management_token
 MaxBuffers: 20
-Volumes:
-  - Type: Directory
-    Root: /var/lib/arvados/$1
 EOF
 
 exec /usr/local/bin/keepstore -config=/var/lib/arvados/$1.yml

commit f5862345c56afa3ea3565db9e6e0edb365b9fa03
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 25 15:29:23 2019 -0400

    13647: Set X-External-Client header in arvbox.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/nginx/run b/tools/arvbox/lib/arvbox/docker/service/nginx/run
index 0d60e7412..1b28a8d01 100755
--- a/tools/arvbox/lib/arvbox/docker/service/nginx/run
+++ b/tools/arvbox/lib/arvbox/docker/service/nginx/run
@@ -28,6 +28,12 @@ http {
      default_type application/octet-stream;
      client_max_body_size 128M;
 
+     geo \$external_client {
+          default     1;
+          127.0.0.0/8 0;
+          $localip/32 0;
+     }
+
      server {
             listen ${services[doc]} default_server;
             listen [::]:${services[doc]} default_server;
@@ -55,6 +61,7 @@ http {
       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_set_header X-External-Client \$external_client;
       proxy_redirect off;
     }
   }

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


hooks/post-receive
--