From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Thu, 5 Sep 2019 18:38:20 +0000 (-0400)
Subject: Merge branch '15529-federated-user-accounts' refs #15529
X-Git-Tag: 2.0.0~210
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7c3e13d4876a8e37feffee3cdaebc44b20b7b61b

Merge branch '15529-federated-user-accounts' refs #15529

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---

7c3e13d4876a8e37feffee3cdaebc44b20b7b61b
diff --cc lib/config/config.default.yml
index 24b2e450eb,3338bec511..c7a038bec6
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -418,18 -415,16 +418,27 @@@ Clusters
        ProviderAppSecret: ""
        ProviderAppID: ""
  
+       # 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 RemoteHosts with Proxy: true)
+       LoginCluster: ""
+ 
+       # How long a cached token belonging to a remote cluster will
+       # remain valid before it needs to be revalidated.
+       RemoteTokenRefresh: 5m
+ 
      Git:
 +      # Path to git or gitolite-shell executable. Each authenticated
 +      # request will execute this program with the single argument "http-backend"
 +      GitCommand: /usr/bin/git
 +
 +      # Path to Gitolite's home directory. If a non-empty path is given,
 +      # the CGI environment will be set up to support the use of
 +      # gitolite-shell as a GitCommand: for example, if GitoliteHome is
 +      # "/gh", then the CGI environment will have GITOLITE_HTTP_HOME=/gh,
 +      # PATH=$PATH:/gh/bin, and GL_BYPASS_ACCESS_CHECKS=1.
 +      GitoliteHome: ""
 +
        # Git repositories must be readable by api server, or you won't be
        # able to submit crunch jobs. To pass the test suites, put a clone
        # of the arvados tree in {git_repositories_dir}/arvados.git or
diff --cc lib/config/generated_config.go
index 8a5b4610c2,ce1d8a1ed8..f8a0e097dc
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -424,18 -421,16 +424,27 @@@ Clusters
        ProviderAppSecret: ""
        ProviderAppID: ""
  
+       # 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 RemoteHosts with Proxy: true)
+       LoginCluster: ""
+ 
+       # How long a cached token belonging to a remote cluster will
+       # remain valid before it needs to be revalidated.
+       RemoteTokenRefresh: 5m
+ 
      Git:
 +      # Path to git or gitolite-shell executable. Each authenticated
 +      # request will execute this program with the single argument "http-backend"
 +      GitCommand: /usr/bin/git
 +
 +      # Path to Gitolite's home directory. If a non-empty path is given,
 +      # the CGI environment will be set up to support the use of
 +      # gitolite-shell as a GitCommand: for example, if GitoliteHome is
 +      # "/gh", then the CGI environment will have GITOLITE_HTTP_HOME=/gh,
 +      # PATH=$PATH:/gh/bin, and GL_BYPASS_ACCESS_CHECKS=1.
 +      GitoliteHome: ""
 +
        # Git repositories must be readable by api server, or you won't be
        # able to submit crunch jobs. To pass the test suites, put a clone
        # of the arvados tree in {git_repositories_dir}/arvados.git or