[ARVADOS] updated: 1.3.0-1646-g3cec8c107

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/cluster-config.sh | 12 ++++++------
 tools/arvbox/lib/arvbox/docker/keep-setup.sh     |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

  discards  8cbb55c614cc5942e9ea807bb7ca4df8160d1952 (commit)
       via  3cec8c10796bb6de9c02c96bbe7dd644c7366e42 (commit)
       via  608a1591840dfbeac3d5580c505b50bfface5929 (commit)
       via  18de39ed805bd1abd36ff4fcf83b5b130d321e74 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (8cbb55c614cc5942e9ea807bb7ca4df8160d1952)
            \
             N -- N -- N (3cec8c10796bb6de9c02c96bbe7dd644c7366e42)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 3cec8c10796bb6de9c02c96bbe7dd644c7366e42
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Sat Sep 21 02:28:37 2019 -0400

    13647: Add keepstore service entries to arvbox 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 2aca64bf9..95c137543 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -80,9 +80,13 @@ Clusters:
       SSO:
         ExternalURL: "https://$localip:${services[sso]}"
       Keepproxy:
+        ExternalURL: "https://$localip:${services[keepproxy-ssl]}"
         InternalURLs:
-          "http://localhost:${services[keepproxy]}/": {}
-        ExternalURL: "https://$localip:${services[keepproxy-ssl]}/"
+          "http://localhost:${services[keepproxy]}": {}
+      Keepstore:
+        InternalURLs:
+          "http://localhost:${services[keepstore0]}": {}
+          "http://localhost:${services[keepstore1]}": {}
       Websocket:
         ExternalURL: "wss://$localip:${services[websockets-ssl]}/websocket"
         InternalURLs:
diff --git a/tools/arvbox/lib/arvbox/docker/keep-setup.sh b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
index b18bfd419..7ac8454d9 100755
--- a/tools/arvbox/lib/arvbox/docker/keep-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
@@ -26,7 +26,7 @@ export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
 set +e
 read -rd $'\000' keepservice <<EOF
 {
- "service_host":"$localip",
+ "service_host":"localhost",
  "service_port":$2,
  "service_ssl_flag":false,
  "service_type":"disk"
@@ -48,7 +48,7 @@ set +e
 sv hup /var/lib/arvbox/service/keepproxy
 
 cat >/var/lib/arvados/$1.yml <<EOF
-Listen: ":$2"
+Listen: "localhost:$2"
 BlobSigningKeyFile: /var/lib/arvados/blob_signing_key
 SystemAuthTokenFile: /var/lib/arvados/superuser_token
 ManagementToken: $management_token

commit 608a1591840dfbeac3d5580c505b50bfface5929
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Sat Sep 21 02:27:34 2019 -0400

    13647: Remove duplicate Keepproxy 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 40034ee6e..2aca64bf9 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -112,10 +112,6 @@ Clusters:
       RailsAPI:
         InternalURLs:
           "http://localhost:${services[api]}/": {}
-      Keepproxy:
-        ExternalURL: "https://$localip:${services[keepproxy-ssl]}"
-        InternalURLs:
-          "http://localhost:${services[keepproxy]}": {}
     PostgreSQL:
       ConnectionPool: 32 # max concurrent connections per arvados server daemon
       Connection:

commit 18de39ed805bd1abd36ff4fcf83b5b130d321e74
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Sat Sep 21 02:26:52 2019 -0400

    13647: Fix send-HUP-to-keepproxy command.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/keep-setup.sh b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
index f16cb44b7..b18bfd419 100755
--- a/tools/arvbox/lib/arvbox/docker/keep-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
@@ -45,7 +45,7 @@ fi
 management_token=$(cat /var/lib/arvados/management_token)
 
 set +e
-killall -HUP keepproxy
+sv hup /var/lib/arvbox/service/keepproxy
 
 cat >/var/lib/arvados/$1.yml <<EOF
 Listen: ":$2"

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


hooks/post-receive
--