From d0049bccec03c4e75a783a59e402467ce2373764 Mon Sep 17 00:00:00 2001
From: Paul Gottschling <paul.gottschling@goteleport.com>
Date: Thu, 16 Jan 2025 09:03:21 -0500
Subject: [PATCH] Use /etc/apt/keyrings for apt public keys

Edit apt-get installation instructions. Backports #50033.
---
 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, 9 insertions(+), 6 deletions(-)

diff --git a/docs/pages/includes/cloud/install-linux-cloud.mdx b/docs/pages/includes/cloud/install-linux-cloud.mdx
index cb0b633f649cb..3e69c704abb68 100644
--- a/docs/pages/includes/cloud/install-linux-cloud.mdx
+++ b/docs/pages/includes/cloud/install-linux-cloud.mdx
@@ -4,13 +4,14 @@
   Add the Teleport repository to your repository list:
 
   ```code
+  $ sudo mkdir -p /etc/apt/keyrings
   # 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/keyrings/teleport-archive-keyring.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] \
+  $ echo "deb [signed-by=/etc/apt/keyrings/teleport-archive-keyring.asc] \
   https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/cloud" \
   | sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null
 
diff --git a/docs/pages/includes/install-linux-ent-self-hosted.mdx b/docs/pages/includes/install-linux-ent-self-hosted.mdx
index 45fdf7b99ecd2..c9ca886ac6067 100644
--- a/docs/pages/includes/install-linux-ent-self-hosted.mdx
+++ b/docs/pages/includes/install-linux-ent-self-hosted.mdx
@@ -3,14 +3,15 @@
 <TabItem label="Debian 9+/Ubuntu 16.04+ (apt)">
 
 ```code
+$ mkdir -p /etc/apt/keyrings
 # 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/keyrings/teleport-archive-keyring.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] \
+$ echo "deb [signed-by=/etc/apt/keyrings/teleport-archive-keyring.asc] \
 https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/v(=teleport.major_version=)" \
 | sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null
 
diff --git a/docs/pages/installation.mdx b/docs/pages/installation.mdx
index d64211c9c2b12..86dadc247d616 100644
--- a/docs/pages/installation.mdx
+++ b/docs/pages/installation.mdx
@@ -241,12 +241,13 @@ repositories.
    <TabItem label="apt">
 
    ```code
+   $ mkdir -p /etc/apt/keyrings
    # 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/keyrings/teleport-archive-keyring.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] \
+   $ echo "deb [signed-by=/etc/apt/keyrings/teleport-archive-keyring.asc] \
    https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} \
    ${TELEPORT_CHANNEL?}" \
    | sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null