Merge branch '21678-installer-diagnostics-internal'. Closes #21678

[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 5d74e4a7e30271923bf3992d100119cea824e724..f867381cff81d7fcceb310bc7ea368bda5a408ed 100644 (file)
--- a/doc/install/packages.html.textile.liquid
+++ b/doc/install/packages.html.textile.liquid
@@ -11,23 +11,35 @@ SPDX-License-Identifier: CC-BY-SA-3.0
 
 On any host where you install Arvados software, you'll need to add the Arvados package repository.  They're available for several popular distributions.
 
 
 On any host where you install Arvados software, you'll need to add the Arvados package repository.  They're available for several popular distributions.
 

-* "Centos 7":#centos7
+* "AlmaLinux, CentOS, RHEL, and Rocky Linux":#redhat

 * "Debian and Ubuntu":#debian
 
 * "Debian and Ubuntu":#debian
 

-h3(#centos7). CentOS
+<notextile>
+<a id="centos7" style="display: none;"></a>
+</notextile>
+
+h3(#redhat). AlmaLinux, CentOS, RHEL, and Rocky Linux

 
 

-Packages are available for CentOS 7. To install them with yum, save this configuration block in @/etc/yum.repos.d/arvados.repo@:
+Packages are available for the following Red Hat-based distributions:
+
+* AlmaLinux 8
+* CentOS 7
+* CentOS 8
+* RHEL 8
+* Rocky Linux 8
+
+To install them with dnf or yum, save this configuration block in @/etc/yum.repos.d/arvados.repo@:

 
 <notextile>
 <pre><code>[arvados]
 name=Arvados
 baseurl=http://rpm.arvados.org/CentOS/$releasever/os/$basearch/
 gpgcheck=1
 
 <notextile>
 <pre><code>[arvados]
 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>
 
 </code></pre>
 </notextile>
 

-{% include 'install_redhat_key' %}
+{% include 'gpg_key_fingerprint' %}

 
 h3(#debian). Debian and Ubuntu
 
 
 h3(#debian). Debian and Ubuntu
 


@@ -37,10 +49,13 @@ First, register the Arvados signing key in apt's database:
 
 {% include 'install_debian_key' %}
 
 
 {% include 'install_debian_key' %}
 

+{% 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|
 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 11 ("bullseye")|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/bullseye 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>|
 |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>|