17344: Merge branch 'main'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc doc/install/automatic.html.textile.liquid
index 33c6fd3d3795d1bb886eff22d49a904121f9a029,d72f8f69eedf70ce6bfa4e32e16f9f06451fb8cf..398ebc20e024c745f4ba49a0b5ecab260ce215e8
--- 1/doc/install/automatic.html.textile.liquid
--- 2/doc/install/automatic.html.textile.liquid
+++ b/doc/install/automatic.html.textile.liquid
@@@ -50,46 -28,20 +50,46 @@@ Arvados needs a login backend. To get s
  h2. Initialize the cluster
  
  <pre>
 -# echo > /etc/apt/sources.list.d/arvados.list "deb http://apt.arvados.org/buster buster main"
 -# apt-get update
 -# apt-get install arvados-server-easy
 -# arvados-server init -cluster-id x9999 -domain x9999.example.com -tls acme -admin-email example@gmail.com.example
 +# echo > /etc/apt/sources.list.d/arvados.list "deb http://apt.arvados.org/$(lsb_release -sc) $(lsb_release -sc) main"
 +# apt update
 +# apt install arvados-server-easy
- # arvados-server init -cluster-id x9999 -domain x9999.example.com -tls auto -login pam
++# arvados-server init -cluster-id x9999 -domain x9999.example.com -tls acme -login pam
  </pre>
  
 -When the "init" command is finished, navigate to the link shown in the terminal (e.g., @https://x9999.example.com/token?api_token=zzzzzzzzzzzzzzzzzzzzzz@). This will log you in to your admin account.
 +When the "init" command is finished, navigate to the link shown in the terminal (e.g., @https://x9999.example.com/@) and log in with the account you created above.
  
 -h2. Enable login
 +Activate your new Arvados user account. Copy the UUID (looks like @x9999-tpzed-xxxxxxxxxxxxxxx@) from your browser's location bar and run:
  
 -Follow the instructions to "set up Google login":{{site.baseurl}}/install/setup-login.html or another authentication option.
 +<pre>
 +# arv sudo user setup --uuid x9999-tpzed-xxxxxxxxxxxxxxx
 +</pre>
 +
 +Run the diagnostics tool to ensure everything is working.
 +
 +<pre>
 +# arv sudo diagnostics
 +</pre>
 +
 +h2. Customize the cluster
 +
 +Things you should plan to update before using your cluster in production:
 +* "Set up Google login":{{site.baseurl}}/install/setup-login.html or another authentication option.
 +* "Set up a wildcard TLS certificate and DNS name,":{{site.baseurl}}/install/install-manual-prerequisites.html#dnstls or enable @TrustAllContent@ mode.
 +* Update storage configuration to use a cloud storage bucket ("S3":{{site.baseurl}}/install/configure-s3-object-storage.html or "Azure":{{site.baseurl}}/install/configure-azure-blob-storage.html) instead of the local filesystem.
 +* Update "CloudVMs configuration":{{site.baseurl}}/install/crunch2-cloud/install-dispatch-cloud.html to use a cloud provider to bring up VMs on demand instead of running containers on the server host.
 +
 +h2. Updating configuration
 +
 +After updating your configuration file (@/etc/arvados/config.yml@), notify the server:
 +
 +<pre>
 +# systemctl reload arvados-server
 +</pre>
  
 -After updating your configuration file (@/etc/arvados/config.yml@), restart the server to make your changes take effect:
 +Optionally, add "AutoReloadConfig: true" at the top of @/etc/arvados/config.yml@. Arvados will automatically reload the config file when it changes.
  
  <pre>
 -# systemctl restart arvados-server
 +AutoReloadConfig: true
 +Clusters:
 +  [...]
  </pre>

diff --cc lib/install/init.go
Simple merge