projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15964-fix-docs' refs #15964
[arvados.git]
/
lib
/
config
/
generated_config.go
diff --git
a/lib/config/generated_config.go
b/lib/config/generated_config.go
index 8e42eb350516d172cec46c99fc0c163dcaa4fb46..57204cf36a2dbe49731c2d7cc32ad51f09522f0a 100644
(file)
--- a/
lib/config/generated_config.go
+++ b/
lib/config/generated_config.go
@@
-695,6
+695,16
@@
Clusters:
ProviderAppID: ""
ProviderAppSecret: ""
ProviderAppID: ""
ProviderAppSecret: ""
+ Test:
+ # Authenticate users listed here in the config file. This
+ # feature is intended to be used in test environments, and
+ # should not be used in production.
+ Enable: false
+ Users:
+ SAMPLE:
+ Email: alice@example.com
+ Password: xyzzy
+
# The cluster ID to delegate the user database. When set,
# logins on this cluster will be redirected to the login cluster
# (login cluster must appear in RemoteClusters with Proxy: true)
# The cluster ID to delegate the user database. When set,
# logins on this cluster will be redirected to the login cluster
# (login cluster must appear in RemoteClusters with Proxy: true)
@@
-704,6
+714,11
@@
Clusters:
# remain valid before it needs to be revalidated.
RemoteTokenRefresh: 5m
# remain valid before it needs to be revalidated.
RemoteTokenRefresh: 5m
+ # How long a client token created from a login flow will be valid without
+ # asking the user to re-login. Example values: 60m, 8h.
+ # Default value zero means tokens don't have expiration.
+ TokenLifetime: 0s
+
Git:
# Path to git or gitolite-shell executable. Each authenticated
# request will execute this program with the single argument "http-backend"
Git:
# Path to git or gitolite-shell executable. Each authenticated
# request will execute this program with the single argument "http-backend"
@@
-1305,7
+1320,7
@@
Clusters:
# a link to the multi-site search page on a "home" Workbench site.
#
# Example:
# a link to the multi-site search page on a "home" Workbench site.
#
# Example:
- # https://workbench.
qr1hi
.arvadosapi.com/collections/multisite
+ # https://workbench.
zzzzz
.arvadosapi.com/collections/multisite
MultiSiteSearch: ""
# Should workbench allow management of local git repositories? Set to false if
MultiSiteSearch: ""
# Should workbench allow management of local git repositories? Set to false if