projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13023-wb-log-newlines'
[arvados.git]
/
services
/
api
/
config
/
application.default.yml
diff --git
a/services/api/config/application.default.yml
b/services/api/config/application.default.yml
index 89f9892d473a90740cfbe447168b8fe4a2bc94b5..a1c35f10fcf1f9e1aae9ead9bf1cda00b5f2535a 100644
(file)
--- a/
services/api/config/application.default.yml
+++ b/
services/api/config/application.default.yml
@@
-410,9
+410,10
@@
common:
arvados_theme: default
arvados_theme: default
- # Permit insecure (OpenSSL::SSL::VERIFY_NONE) connections to the Single Sign
- # On (sso) server. Should only be enabled during development when the SSO
- # server is using a self-signed cert.
+ # Permit insecure (OpenSSL::SSL::VERIFY_NONE) connections to the
+ # Single Sign On (sso) server and remote Arvados sites. Should only
+ # be enabled during development when the SSO server is using a
+ # self-signed cert.
sso_insecure: false
## Set Time.zone default to the specified zone and make Active
sso_insecure: false
## Set Time.zone default to the specified zone and make Active
@@
-468,6
+469,13
@@
common:
# Server expects request header of the format "Authorization: Bearer xxx"
ManagementToken: false
# Server expects request header of the format "Authorization: Bearer xxx"
ManagementToken: false
+ # URL of keep-web service. Provides read/write access to collections via
+ # HTTP and WebDAV protocols.
+ #
+ # Example:
+ # keep_web_service_url: https://download.uuid_prefix.arvadosapi.com/
+ keep_web_service_url: false
+
development:
force_ssl: false
cache_classes: false
development:
force_ssl: false
cache_classes: false