projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17212-fix-port-conflicts'
[arvados.git]
/
lib
/
config
/
config.default.yml
diff --git
a/lib/config/config.default.yml
b/lib/config/config.default.yml
index 005d2738da5641bcadaea77b02fa351ce99298f1..4c817852e05fbd8c67ad2b15b157e6103aae633f 100644
(file)
--- a/
lib/config/config.default.yml
+++ b/
lib/config/config.default.yml
@@
-12,6
+12,8
@@
Clusters:
xxxxx:
Clusters:
xxxxx:
+ # Token used internally by Arvados components to authenticate to
+ # one another. Use a string of at least 50 random alphanumerics.
SystemRootToken: ""
# Token to be included in all healthcheck requests. Disabled by default.
SystemRootToken: ""
# Token to be included in all healthcheck requests. Disabled by default.
@@
-195,7
+197,7
@@
Clusters:
# * 1.1) fits comfortably in memory. On a host dedicated to running
# Keepstore, divide total memory by 88MiB to suggest a suitable value.
# For example, if grep MemTotal /proc/meminfo reports MemTotal: 7125440
# * 1.1) fits comfortably in memory. On a host dedicated to running
# Keepstore, divide total memory by 88MiB to suggest a suitable value.
# For example, if grep MemTotal /proc/meminfo reports MemTotal: 7125440
- # kB, compute 7125440 / (88 * 1024)=79 and
configure Max
Buffers: 79
+ # kB, compute 7125440 / (88 * 1024)=79 and
set MaxKeepBlob
Buffers: 79
MaxKeepBlobBuffers: 128
# API methods to disable. Disabled methods are not listed in the
MaxKeepBlobBuffers: 128
# API methods to disable. Disabled methods are not listed in the
@@
-212,11
+214,6
@@
Clusters:
# serving a single incoming multi-cluster (federated) request.
MaxRequestAmplification: 4
# serving a single incoming multi-cluster (federated) request.
MaxRequestAmplification: 4
- # RailsSessionSecretToken is a string of alphanumeric characters
- # used by Rails to sign session tokens. IMPORTANT: This is a
- # site secret. It should be at least 50 characters.
- RailsSessionSecretToken: ""
-
# Maximum wall clock time to spend handling an incoming request.
RequestTimeout: 5m
# Maximum wall clock time to spend handling an incoming request.
RequestTimeout: 5m
@@
-258,9
+255,6
@@
Clusters:
# The e-mail address of the user you would like to become marked as an admin
# user on their first login.
# The e-mail address of the user you would like to become marked as an admin
# user on their first login.
- # In the default configuration, authentication happens through the Arvados SSO
- # server, which uses OAuth2 against Google's servers, so in that case this
- # should be an address associated with a Google account.
AutoAdminUserWithEmail: ""
# If AutoAdminFirstUser is set to true, the first user to log in when no
AutoAdminUserWithEmail: ""
# If AutoAdminFirstUser is set to true, the first user to log in when no
@@
-276,9
+270,10
@@
Clusters:
NewUserNotificationRecipients: {}
NewInactiveUserNotificationRecipients: {}
NewUserNotificationRecipients: {}
NewInactiveUserNotificationRecipients: {}
- # Set AnonymousUserToken to enable anonymous user access. You can get
- # the token by running "bundle exec ./script/get_anonymous_user_token.rb"
- # in the directory where your API server is running.
+ # Set AnonymousUserToken to enable anonymous user access. Populate this
+ # field with a long random string. Then run "bundle exec
+ # ./script/get_anonymous_user_token.rb" in the directory where your API
+ # server is running to record the token in the database.
AnonymousUserToken: ""
# If a new user has an alternate email address (local@domain)
AnonymousUserToken: ""
# If a new user has an alternate email address (local@domain)
@@
-1045,7
+1040,7
@@
Clusters:
# Cloud-specific driver parameters.
DriverParameters:
# Cloud-specific driver parameters.
DriverParameters:
- # (ec2) Credentials.
+ # (ec2) Credentials.
Omit or leave blank if using IAM role.
AccessKeyID: ""
SecretAccessKey: ""
AccessKeyID: ""
SecretAccessKey: ""