Merge branch '21666-provision-test-improvement'

[arvados.git] / tools / arvbox / lib / arvbox / docker / cluster-config.sh

diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index 2a286637f6ae5482aa24d91c2ef651784729c984..d07fc3d34d550c8ad4ba2f826a29ec01488e03ad 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -56,11 +56,6 @@ if ! (psql postgres -c "\du" | grep "^ arvados ") >/dev/null ; then
 fi
 psql postgres -c "ALTER USER arvados WITH SUPERUSER;"
 
-if ! test -s $ARVADOS_CONTAINER_PATH/workbench_secret_token ; then
-  ruby -e 'puts rand(2**400).to_s(36)' > $ARVADOS_CONTAINER_PATH/workbench_secret_token
-fi
-workbench_secret_key_base=$(cat $ARVADOS_CONTAINER_PATH/workbench_secret_token)
-
 if test -s $ARVADOS_CONTAINER_PATH/api_rails_env ; then
   database_env=$(cat $ARVADOS_CONTAINER_PATH/api_rails_env)
 else
@@ -77,7 +72,7 @@ Clusters:
         InternalURLs:
           "http://localhost:${services[api]}": {}
       Workbench1:
-        ExternalURL: "https://$localip:${services[workbench]}"
+        ExternalURL: "https://$localip:${services[workbench2-ssl]}"
       Workbench2:
         ExternalURL: "https://$localip:${services[workbench2-ssl]}"
       Keepproxy:
@@ -92,12 +87,6 @@ Clusters:
         ExternalURL: "wss://$localip:${services[websockets-ssl]}/websocket"
         InternalURLs:
           "http://localhost:${services[websockets]}": {}
-      GitSSH:
-        ExternalURL: "ssh://git@$localip:"
-      GitHTTP:
-        InternalURLs:
-          "http://localhost:${services[arv-git-httpd]}/": {}
-        ExternalURL: "https://$localip:${services[arv-git-httpd-ssl]}/"
       WebDAV:
         InternalURLs:
           "http://localhost:${services[keep-web]}/": {}
@@ -106,8 +95,6 @@ Clusters:
         InternalURLs:
           "http://localhost:${services[keep-web]}/": {}
         ExternalURL: "https://$localip:${services[keep-web-dl-ssl]}/"
-      Composer:
-        ExternalURL: "https://$localip:${services[composer]}"
       Controller:
         ExternalURL: "https://$localip:${services[controller-ssl]}"
         InternalURLs:
@@ -129,6 +116,8 @@ Clusters:
       BlobSigningKey: $blob_signing_key
       DefaultReplication: 1
       TrustAllContent: true
+    Containers:
+      RuntimeEngine: singularity
     Login:
       Test:
         Enable: true
@@ -137,14 +126,6 @@ Clusters:
       AutoAdminFirstUser: true
       AutoSetupNewUsers: true
       AutoSetupNewUsersWithVmUUID: $vm_uuid
-      AutoSetupNewUsersWithRepository: true
-    Workbench:
-      SecretKeyBase: $workbench_secret_key_base
-      ArvadosDocsite: http://$localip:${services[doc]}/
-    Git:
-      GitCommand: /usr/share/gitolite3/gitolite-shell
-      GitoliteHome: $ARVADOS_CONTAINER_PATH/git
-      Repositories: $ARVADOS_CONTAINER_PATH/git/repositories
     Volumes:
       ${uuid_prefix}-nyw5e-000000000000000:
         Driver: Directory
@@ -175,7 +156,6 @@ chmod og-rw \
       $ARVADOS_CONTAINER_PATH/management_token \
       $ARVADOS_CONTAINER_PATH/system_root_token \
       $ARVADOS_CONTAINER_PATH/api_database_pw \
-      $ARVADOS_CONTAINER_PATH/workbench_secret_token \
       $ARVADOS_CONTAINER_PATH/superuser_token \
 set -e