[ARVADOS] updated: 1.3.0-854-g9794db8c7

[Git user]

Summary of changes:
 .../lib/arvbox/docker/service/controller/run       | 39 +++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

       via  9794db8c78656af88a8e539bafbb990476c0be07 (commit)
      from  0f1476fae8e60066c536ae85937975b793d6fb08 (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 9794db8c78656af88a8e539bafbb990476c0be07
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon May 13 09:58:39 2019 -0400

    Migrate arvbox api application.yml settings to config.yml
    
    To set workbench2 url.  refs #15064
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/service/controller/run
index 06a9ba708..37052e123 100755
--- a/tools/arvbox/lib/arvbox/docker/service/controller/run
+++ b/tools/arvbox/lib/arvbox/docker/service/controller/run
@@ -18,6 +18,11 @@ if test "$1" = "--only-deps" ; then
 fi
 
 uuid_prefix=$(cat /var/lib/arvados/api_uuid_prefix)
+secret_token=$(cat /var/lib/arvados/api_secret_token)
+blob_signing_key=$(cat /var/lib/arvados/blob_signing_key)
+management_token=$(cat /var/lib/arvados/management_token)
+sso_app_secret=$(cat /var/lib/arvados/sso_app_secret)
+vm_uuid=$(cat /var/lib/arvados/vm-uuid)
 database_pw=$(cat /var/lib/arvados/api_database_pw)
 
 if test -s /var/lib/arvados/api_rails_env ; then
@@ -31,7 +36,23 @@ mkdir -p /etc/arvados
 cat >/var/lib/arvados/cluster_config.yml <<EOF
 Clusters:
   ${uuid_prefix}:
-    NodeProfiles:
+    ManagementToken: $management_token
+    Services:
+      Workbench1:
+        ExternalURL: "https://$localip:${services[workbench]}"
+      Workbench2:
+        ExternalURL: "https://$localip:${services[workbench2-ssl]}"
+      SSO:
+        ExternalURL: "https://$localip:${services[sso]}"
+      Websocket:
+        ExternalURL: "wss://$localip:${services[websockets-ssl]}/websocket"
+      GitSSH:
+        ExternalURL: "ssh://git@$localip:"
+      GitHTTP:
+        ExternalURL: "http://$localip:${services[arv-git-httpd]}/"
+      WebDAV:
+        ExternalURL: "https://$localip:${services[keep-web-ssl]}/"
+    NodeProfiles:  # to be deprecated in favor of "Services" section
       "*":
         arvados-controller:
           Listen: ":${services[controller]}" # choose a port
@@ -47,6 +68,22 @@ Clusters:
         Password: ${database_pw}
         DBName: arvados_${database_env}
         client_encoding: utf8
+    API:
+      RailsSessionSecretToken: $secret_token
+    Collections:
+      BlobSigningKey: $blob_signing_key
+      DefaultReplication: 1
+    Containers:
+      SupportedDockerImageFormats: ["v2"]
+    Login:
+      ProviderAppSecret: $sso_app_secret
+      ProviderAppID: arvados-server
+    Users:
+      NewUsersAreActive: true
+      AutoAdminFirstUser: true
+      AutoSetupNewUsers: true
+      AutoSetupNewUsersWithVmUUID: $vm_uuid
+      AutoSetupNewUsersWithRepository: true
 EOF
 
 /usr/local/lib/arvbox/yml_override.py /var/lib/arvados/cluster_config.yml

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


hooks/post-receive
--