projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18947-keep-balance'
[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 948eb00a559acfbb8f7ffaf48f8a79cbc9c8bfab..dfc9d1fece777629d65088867fd48c347bbd2feb 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/
tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@
-105,9
+105,7
@@
Clusters:
WebDAVDownload:
InternalURLs:
"http://localhost:${services[keep-web]}/": {}
WebDAVDownload:
InternalURLs:
"http://localhost:${services[keep-web]}/": {}
- ExternalURL: "https://$localip:${services[keep-web-ssl]}/"
- Composer:
- ExternalURL: "https://$localip:${services[composer]}"
+ ExternalURL: "https://$localip:${services[keep-web-dl-ssl]}/"
Controller:
ExternalURL: "https://$localip:${services[controller-ssl]}"
InternalURLs:
Controller:
ExternalURL: "https://$localip:${services[controller-ssl]}"
InternalURLs:
@@
-125,12
+123,12
@@
Clusters:
password: ${database_pw}
dbname: arvados_${database_env}
client_encoding: utf8
password: ${database_pw}
dbname: arvados_${database_env}
client_encoding: utf8
- API:
- RailsSessionSecretToken: $secret_token
Collections:
BlobSigningKey: $blob_signing_key
DefaultReplication: 1
TrustAllContent: true
Collections:
BlobSigningKey: $blob_signing_key
DefaultReplication: 1
TrustAllContent: true
+ Containers:
+ RuntimeEngine: singularity
Login:
Test:
Enable: true
Login:
Test:
Enable: true