From 338e4ed61845e4f47dac7625db73a89ddfc7da21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20R=C3=A9p=C3=A1si?= Date: Tue, 2 Apr 2024 20:44:40 +0200 Subject: [PATCH] Docs: deprecate the usage of apt-key and adopt distribution name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Tibor Répási; reviewed by brandonwilliams for CASSANDRA-19110 --- .../cassandra/examples/BASH/add_repo_keys.sh | 2 +- .../cassandra/examples/BASH/get_deb_package.sh | 2 +- .../cassandra/partials/package_versions.adoc | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/doc/modules/cassandra/examples/BASH/add_repo_keys.sh b/doc/modules/cassandra/examples/BASH/add_repo_keys.sh index 4c1d5f1777..b09d9d42cb 100644 --- a/doc/modules/cassandra/examples/BASH/add_repo_keys.sh +++ b/doc/modules/cassandra/examples/BASH/add_repo_keys.sh @@ -1 +1 @@ -$ curl https://downloads.apache.org/cassandra/KEYS | sudo apt-key add - +$ curl -o /etc/apt/keyrings/apache-cassandra.asc https://downloads.apache.org/cassandra/KEYS diff --git a/doc/modules/cassandra/examples/BASH/get_deb_package.sh b/doc/modules/cassandra/examples/BASH/get_deb_package.sh index 0b866a8310..ab34c32a98 100644 --- a/doc/modules/cassandra/examples/BASH/get_deb_package.sh +++ b/doc/modules/cassandra/examples/BASH/get_deb_package.sh @@ -1,2 +1,2 @@ -$ echo "deb https://debian.cassandra.apache.org 311x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list +$ echo "deb [signed-by=/etc/apt/keyrings/apache-cassandra.asc] https://debian.cassandra.apache.org 311x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list deb https://debian.cassandra.apache.org 311x main diff --git a/doc/modules/cassandra/partials/package_versions.adoc b/doc/modules/cassandra/partials/package_versions.adoc index f5c89689ee..406ae9cc59 100644 --- a/doc/modules/cassandra/partials/package_versions.adoc +++ b/doc/modules/cassandra/partials/package_versions.adoc @@ -1,5 +1,10 @@ -The latest major version is {311_version} and the -corresponding distribution name is `311x` (with an "x" as the suffix). -For older releases use `30x` for {30_version}, `22x` for {22_version} and -`21x` for {21_version}. +The latest major version is {311_version} and the corresponding distribution name is `311x` (with an "x" as the suffix). +For older releases use: + +* `311x` for C* {311_version} series +* `30x` for C* {30_version} series +* `22x` for C* {22_version} series +* `21x` for C* {21_version} series +* `20x` for C* {20_version} series + For example, to add the repository for version {311_version} (`311x`):