[ARVADOS] updated: 2.1.0-197-g80a903012

[Git user]

Summary of changes:
 doc/install/install-api-server.html.textile.liquid | 15 +++++++--------
 lib/config/config.default.yml                      |  2 ++
 lib/config/generated_config.go                     |  2 ++
 3 files changed, 11 insertions(+), 8 deletions(-)

       via  80a90301263f46ebb7b26297093763882f2cf582 (commit)
       via  efeca068c2c25ee075ee8907a1937a5d4119775c (commit)
       via  9869b312368e2dd7a7156c7fbd53714f73a77ead (commit)
      from  83898701e9c75661a240cadcf31f80cbccbb698e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 80a90301263f46ebb7b26297093763882f2cf582
Merge: 83898701e efeca068c
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Tue Dec 8 11:02:19 2020 -0500

    17151: Merge branch 'master'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --cc doc/install/install-api-server.html.textile.liquid
index 2893111e3,c7303bbba..ca55be53e
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@@ -48,21 -48,23 +48,20 @@@ h3. Token
  <notextile>
  <pre><code>    SystemRootToken: <span class="userinput">"$system_root_token"</span>
      ManagementToken: <span class="userinput">"$management_token"</span>
 -    API:
 -      RailsSessionSecretToken: <span class="userinput">"$rails_secret_token"</span>
      Collections:
-       BlobSigningKey: <span class="userinput">"blob_signing_key"</span>
+       BlobSigningKey: <span class="userinput">"$blob_signing_key"</span>
  </code></pre>
  </notextile>
  
- @SystemRootToken@ is used by Arvados system services to authenticate as the system (root) user when communicating with the API server.
+ These secret tokens are used to authenticate messages between Arvados components.
+ * @SystemRootToken@ is used by Arvados system services to authenticate as the system (root) user when communicating with the API server.
+ * @ManagementToken@ is used to authenticate access to system metrics.
 -* @API.RailsSessionSecretToken@ is used to sign session cookies.
+ * @Collections.BlobSigningKey@ is used to control access to Keep blocks.
  
- @ManagementToken@ is used to authenticate access to system metrics.
- 
- @Collections.BlobSigningKey@ is used to control access to Keep blocks.
- 
- You can generate a random token for each of these items at the command line like this:
+ Each token should be a string of at least 50 alphanumeric characters. You can generate a suitable token with the following command:
  
  <notextile>
- <pre><code>~$ <span class="userinput">tr -dc 0-9a-zA-Z </dev/urandom | head -c50; echo</span>
+ <pre><code>~$ <span class="userinput">tr -dc 0-9a-zA-Z </dev/urandom | head -c50 ; echo</span>
  </code></pre>
  </notextile>
  

-----------------------------------------------------------------------


hooks/post-receive
--