From 1c0a5b0d9478f8862daf96d320c00234ba936324 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Thu, 30 May 2024 16:16:22 -0400 Subject: [PATCH] 21388: Update list of supported distros in web documentation Arvados-DCO-1.1-Signed-off-by: Brett Smith --- .../_install_ruby_and_bundler.liquid | 2 +- doc/_includes/_supportedlinux.liquid | 5 ++--- .../install-postgresql.html.textile.liquid | 19 +------------------ doc/install/nginx.html.textile.liquid | 7 ------- doc/install/packages.html.textile.liquid | 6 ++---- 5 files changed, 6 insertions(+), 33 deletions(-) diff --git a/doc/_includes/_install_ruby_and_bundler.liquid b/doc/_includes/_install_ruby_and_bundler.liquid index 4381d9fedf..cb220f569a 100644 --- a/doc/_includes/_install_ruby_and_bundler.liquid +++ b/doc/_includes/_install_ruby_and_bundler.liquid @@ -17,7 +17,7 @@ Version 8 of these distributions provides Ruby 2.7. You can install it by runnin h2. Debian and Ubuntu -Debian 11 (bullseye) and Ubuntu 20.04 (focal) and later ship with Ruby 2.7 or newer, which is sufficient for Arvados. +All supported versions of Debian and Ubuntu include a version of Ruby you can use with Arvados. 
# apt-get --no-install-recommends install ruby ruby-dev
diff --git a/doc/_includes/_supportedlinux.liquid b/doc/_includes/_supportedlinux.liquid index 81ee8cb047..a8df6d6fdf 100644 --- a/doc/_includes/_supportedlinux.liquid +++ b/doc/_includes/_supportedlinux.liquid @@ -8,10 +8,9 @@ table(table table-bordered table-condensed). |_. *Supported Linux Distributions*| |AlmaLinux 8| |CentOS 8| -|CentOS 7| |Red Hat Enterprise Linux 8| |Rocky Linux 8| +|Debian 12 ("bookworm")| |Debian 11 ("bullseye")| -|Debian 10 ("buster")| +|Ubuntu 22.04 ("jammy")| |Ubuntu 20.04 ("focal")| -|Ubuntu 18.04 ("bionic")| diff --git a/doc/install/install-postgresql.html.textile.liquid b/doc/install/install-postgresql.html.textile.liquid index 56ad95635c..300bdeb540 100644 --- a/doc/install/install-postgresql.html.textile.liquid +++ b/doc/install/install-postgresql.html.textile.liquid @@ -12,7 +12,6 @@ SPDX-License-Identifier: CC-BY-SA-3.0 Arvados requires at least version *9.4* of PostgreSQL. We recommend using version 10 or newer. * "AWS":#aws -* "CentOS 7":#centos7 * "Alma/CentOS/Red Hat/Rocky 8":#rh8 * "Debian or Ubuntu":#debian @@ -20,22 +19,6 @@ h3(#aws). AWS When deploying on AWS, Arvados can use an Aurora RDS PostgreSQL database. Aurora Serverless is not recommended. -h3(#centos7). CentOS 7 -{% assign rh_version = "7" %} -{% include 'note_python_sc' %} - -# Install PostgreSQL - 
# yum install rh-postgresql12 rh-postgresql12-postgresql-contrib
-~$ scl enable rh-postgresql12 bash
 -# Initialize the database - 
# postgresql-setup initdb
 -# Configure the database to accept password connections from localhost - 
# sed -ri -e 's/^(host +all +all +(127\.0\.0\.1\/32|::1\/128) +)ident$/\1md5/' /var/lib/pgsql/data/pg_hba.conf
 -# Configure the database to accept password connections from the local network (replace @10.9.8.0/24@ with your private network mask) - 
# echo 'host all all 10.9.8.0/24 md5' | tee -a /var/lib/pgsql/data/pg_hba.conf
 -# Configure the database to launch at boot and start now - 
# systemctl enable --now rh-postgresql12-postgresql
 - h3(#rh8). Alma/CentOS/Red Hat/Rocky 8 {% comment %} @@ -55,7 +38,7 @@ The default version on RH8 is PostgreSQL 10. You can install up to PostgreSQL 13 h3(#debian). Debian or Ubuntu -Debian 10 (Buster) and Ubuntu 16.04 (Xenial) and later versions include a sufficiently recent version of Postgres. +All supported versions of Debian and Ubuntu include a version of PostgreSQL you can use with Arvados. # Install PostgreSQL 
# apt-get --no-install-recommends install postgresql postgresql-contrib
 diff --git a/doc/install/nginx.html.textile.liquid b/doc/install/nginx.html.textile.liquid index 7d97c3e383..853f3ce056 100644 --- a/doc/install/nginx.html.textile.liquid +++ b/doc/install/nginx.html.textile.liquid @@ -9,13 +9,6 @@ Copyright (C) The Arvados Authors. All rights reserved. SPDX-License-Identifier: CC-BY-SA-3.0 {% endcomment %} -h3. CentOS 7 - - -
# yum install epel-release
-# yum install nginx
- - h3. Alma/CentOS/Red Hat/Rocky 8 diff --git a/doc/install/packages.html.textile.liquid b/doc/install/packages.html.textile.liquid index f867381cff..7fb0419ceb 100644 --- a/doc/install/packages.html.textile.liquid +++ b/doc/install/packages.html.textile.liquid @@ -23,7 +23,6 @@ h3(#redhat). AlmaLinux, CentOS, RHEL, and Rocky Linux Packages are available for the following Red Hat-based distributions: * AlmaLinux 8 -* CentOS 7 * CentOS 8 * RHEL 8 * Rocky Linux 8 @@ -55,11 +54,10 @@ As root, add the Arvados package repository to your sources. This command depen table(table table-bordered table-condensed). |_. OS version|_. Command| +|Debian 12 ("bookworm")|echo "deb http://apt.arvados.org/bookworm bookworm main" | tee /etc/apt/sources.list.d/arvados.list| |Debian 11 ("bullseye")|echo "deb http://apt.arvados.org/bullseye bullseye main" | tee /etc/apt/sources.list.d/arvados.list| -|Debian 10 ("buster")|echo "deb http://apt.arvados.org/buster buster main" | tee /etc/apt/sources.list.d/arvados.list| +|Ubuntu 22.04 ("jammy")[1]|echo "deb http://apt.arvados.org/jammy jammy main" | tee /etc/apt/sources.list.d/arvados.list| |Ubuntu 20.04 ("focal")[1]|echo "deb http://apt.arvados.org/focal focal main" | tee /etc/apt/sources.list.d/arvados.list| -|Ubuntu 18.04 ("bionic")[1]|echo "deb http://apt.arvados.org/bionic bionic main" | tee /etc/apt/sources.list.d/arvados.list| - {% include 'notebox_begin' %} -- 2.30.2