X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7c7b9ab80e1b33a108c55a23b3dfe793a73ecc95..343e87375ce53c0b9c4234ed69206b31e206c877:/lib/config/generated_config.go
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 79c3847173..2d8a487b7d 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -461,13 +461,13 @@ Clusters:
# If non-empty, allow project and collection names to contain
# the "/" character (slash/stroke/solidus), and replace "/" with
# the given string in the filesystem hierarchy presented by
- # WebDAV. Possible values include "%2f" and "{slash}". Names
- # that contain the substitution string itself may result in
- # confusing behavior.
+ # WebDAV. Example values are "%2f" and "{slash}". Names that
+ # contain the substitution string itself may result in confusing
+ # behavior, so a value like "_" is not recommended.
#
- # If the default empty value is used, names containing "/"
- # cannot be used when creating or renaming a collection or
- # project.
+ # If the default empty value is used, the server will reject
+ # requests to create or rename a collection when the new name
+ # contains "/".
#
# If the value "/" is used, project and collection names
# containing "/" will be allowed, but they will not be
@@ -629,7 +629,7 @@ Clusters:
# (experimental) cloud dispatcher for executing containers on
# worker VMs. Begins with "-----BEGIN RSA PRIVATE KEY-----\n"
# and ends with "\n-----END RSA PRIVATE KEY-----\n".
- DispatchPrivateKey: none
+ DispatchPrivateKey: ""
# Maximum time to wait for workers to come up before abandoning
# stale locks from a previous dispatch process.
@@ -661,7 +661,7 @@ Clusters:
# has been reached or crunch_log_seconds_between_events has elapsed since
# the last flush.
LogBytesPerEvent: 4096
- LogSecondsBetweenEvents: 1
+ LogSecondsBetweenEvents: 5s
# The sample period for throttling logs.
LogThrottlePeriod: 60s
@@ -1159,6 +1159,8 @@ Clusters:
identification, and does not retrieve any other personal
information.
+ # Workbench screen displayed to inactive users. This is HTML
+ # text that will be incorporated directly onto the page.
InactivePageHTML: |
An administrator must activate your account before you can get any further.
+ # Connecting to Arvados shell VMs tends to be site-specific. + # Put any special instructions here. This is HTML text that will + # be incorporated directly onto the Workbench page. + SSHHelpPageHTML: | + Accessing an Arvados VM with SSH (generic instructions). + Site configurations vary. Contact your local cluster administrator if you have difficulty accessing an Arvados shell node. + # Bypass new (Arvados 1.5) API implementations, and hand off # requests directly to Rails instead. This can provide a temporary # workaround for clients that are incompatible with the new API