Merge branch '18216-arvados-server-keepstore'

[arvados.git] / doc / install / packages.html.textile.liquid

diff --git a/doc/install/packages.html.textile.liquid b/doc/install/packages.html.textile.liquid
index 9898e91a3c9bb4462e7d3c23eaee713b75180942..a111843a6545f646d40064768967d6e01f005af4 100644 (file)
--- a/doc/install/packages.html.textile.liquid
+++ b/doc/install/packages.html.textile.liquid
@@ -23,28 +23,30 @@ Packages are available for CentOS 7. To install them with yum, save this configu
 name=Arvados
 baseurl=http://rpm.arvados.org/CentOS/$releasever/os/$basearch/
 gpgcheck=1
-gpgkey=http://rpm.arvados.org/CentOS/RPM-GPG-KEY-curoverse
+gpgkey=http://rpm.arvados.org/CentOS/RPM-GPG-KEY-arvados
 </code></pre>
 </notextile>
 
-{% include 'install_redhat_key' %}
+{% include 'gpg_key_fingerprint' %}
 
 h3(#debian). Debian and Ubuntu
 
 Packages are available for recent versions of Debian and Ubuntu.
 
-First, register the Curoverse signing key in apt's database:
+First, register the Arvados signing key in apt's database:
 
 {% include 'install_debian_key' %}
 
-Configure apt to retrieve packages from the Arvados package repository. This command depends on your OS vendor and version:
+{% include 'gpg_key_fingerprint' %}
+
+As root, add the Arvados package repository to your sources.  This command depends on your OS vendor and version:
 
 table(table table-bordered table-condensed).
 |_. OS version|_. Command|
-|Debian 10 ("buster")|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ buster main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
-|Debian 9 ("stretch")|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ stretch main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
-|Ubuntu 18.04 ("bionic")[1]|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ bionic main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
-|Ubuntu 16.04 ("xenial")[1]|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ xenial main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
+|Debian 11 ("bullseye")|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/buster bullseye main" &#x7c; tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
+|Debian 10 ("buster")|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/buster buster main" &#x7c; tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
+|Ubuntu 20.04 ("focal")[1]|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/focal focal main" &#x7c; tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
+|Ubuntu 18.04 ("bionic")[1]|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/bionic bionic main" &#x7c; tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
 
 
 {% include 'notebox_begin' %}
@@ -56,6 +58,6 @@ fn1. Arvados packages for Ubuntu may depend on third-party packages in Ubuntu's
 Retrieve the package list:
 
 <notextile>
-<pre><code>~$ <span class="userinput">sudo apt-get update</span>
+<pre><code># <span class="userinput">apt-get update</span>
 </code></pre>
 </notextile>