From e5c17d6821cfff394bd053ca06c5748d64d54090 Mon Sep 17 00:00:00 2001 From: Paul Gottschling Date: Tue, 10 Dec 2024 13:50:35 -0500 Subject: [PATCH] Edit `apt-get` installation instructions Closes #24564 Show using `/etc/apt/trusted.gpg.d`, a directory that `apt-get` searches automatically, for storing public keys. Edit the three locations where we showed using `/usr/share/keyrings`, including two partials. --- docs/pages/includes/cloud/install-linux-cloud.mdx | 5 ++--- docs/pages/includes/install-linux-ent-self-hosted.mdx | 5 ++--- docs/pages/installation.mdx | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/pages/includes/cloud/install-linux-cloud.mdx b/docs/pages/includes/cloud/install-linux-cloud.mdx index cb0b633f649cb..20374c347bf52 100644 --- a/docs/pages/includes/cloud/install-linux-cloud.mdx +++ b/docs/pages/includes/cloud/install-linux-cloud.mdx @@ -6,12 +6,11 @@ ```code # Download Teleport's PGP public key $ sudo curl https://apt.releases.teleport.dev/gpg \ - -o /usr/share/keyrings/teleport-archive-keyring.asc + -o /etc/apt/trusted.gpg.d/teleport.asc # Source variables about OS version $ source /etc/os-release # Add the Teleport APT repository for cloud. - $ echo "deb [signed-by=/usr/share/keyrings/teleport-archive-keyring.asc] \ - https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/cloud" \ + $ echo "deb https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/cloud" \ | sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null # Provide your Teleport domain to query the latest compatible Teleport version diff --git a/docs/pages/includes/install-linux-ent-self-hosted.mdx b/docs/pages/includes/install-linux-ent-self-hosted.mdx index 45fdf7b99ecd2..3a907685ece22 100644 --- a/docs/pages/includes/install-linux-ent-self-hosted.mdx +++ b/docs/pages/includes/install-linux-ent-self-hosted.mdx @@ -5,13 +5,12 @@ ```code # Download Teleport's PGP public key $ sudo curl https://apt.releases.teleport.dev/gpg \ --o /usr/share/keyrings/teleport-archive-keyring.asc +-o /etc/apt/trusted.gpg.d/teleport.asc # Source variables about OS version $ source /etc/os-release # Add the Teleport APT repository for v(=teleport.major_version=). You'll need to update this # file for each major release of Teleport. -$ echo "deb [signed-by=/usr/share/keyrings/teleport-archive-keyring.asc] \ -https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/v(=teleport.major_version=)" \ +$ echo "deb https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/v(=teleport.major_version=)" \ | sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null $ sudo apt-get update diff --git a/docs/pages/installation.mdx b/docs/pages/installation.mdx index fbc2671d74b92..c671fae31435a 100644 --- a/docs/pages/installation.mdx +++ b/docs/pages/installation.mdx @@ -243,11 +243,10 @@ repositories. ```code # Download the Teleport PGP public key $ sudo curl https://apt.releases.teleport.dev/gpg \ - -o /usr/share/keyrings/teleport-archive-keyring.asc + -o /etc/apt/trusted.gpg.d/teleport.asc # Add the Teleport APT repository. You'll need to update this file for each # major release of Teleport. - $ echo "deb [signed-by=/usr/share/keyrings/teleport-archive-keyring.asc] \ - https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} \ + $ echo "deb https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} \ ${TELEPORT_CHANNEL?}" \ | sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null