Skip to content

Commit

Permalink
Edit apt-get installation instructions (#50033)
Browse files Browse the repository at this point in the history
* 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.

Trust only the Teleport-issued public key when validating Teleport DEB
packages.

* Use /etc/apt/keyrings for apt public keys

Respond to marcoandredinis feedback.
  • Loading branch information
ptgott authored Jan 16, 2025
1 parent 50c659f commit 84dd3da
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
5 changes: 3 additions & 2 deletions docs/pages/includes/cloud/install-linux-cloud.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docs/pages/includes/install-linux-ent-self-hosted.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docs/pages/installation.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 84dd3da

Please sign in to comment.