Skip to content

Commit 84dd3da

Browse files
authored
Edit apt-get installation instructions (#50033)
* 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.
1 parent 50c659f commit 84dd3da

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

docs/pages/includes/cloud/install-linux-cloud.mdx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
Add the Teleport repository to your repository list:
55

66
```code
7+
$ sudo mkdir -p /etc/apt/keyrings
78
# Download Teleport's PGP public key
89
$ sudo curl https://apt.releases.teleport.dev/gpg \
9-
-o /usr/share/keyrings/teleport-archive-keyring.asc
10+
-o /etc/apt/keyrings/teleport-archive-keyring.asc
1011
# Source variables about OS version
1112
$ source /etc/os-release
1213
# Add the Teleport APT repository for cloud.
13-
$ echo "deb [signed-by=/usr/share/keyrings/teleport-archive-keyring.asc] \
14+
$ echo "deb [signed-by=/etc/apt/keyrings/teleport-archive-keyring.asc] \
1415
https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/cloud" \
1516
| sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null
1617

docs/pages/includes/install-linux-ent-self-hosted.mdx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
<TabItem label="Debian 9+/Ubuntu 16.04+ (apt)">
44

55
```code
6+
$ mkdir -p /etc/apt/keyrings
67
# Download Teleport's PGP public key
78
$ sudo curl https://apt.releases.teleport.dev/gpg \
8-
-o /usr/share/keyrings/teleport-archive-keyring.asc
9+
-o /etc/apt/keyrings/teleport-archive-keyring.asc
910
# Source variables about OS version
1011
$ source /etc/os-release
1112
# Add the Teleport APT repository for v(=teleport.major_version=). You'll need to update this
1213
# file for each major release of Teleport.
13-
$ echo "deb [signed-by=/usr/share/keyrings/teleport-archive-keyring.asc] \
14+
$ echo "deb [signed-by=/etc/apt/keyrings/teleport-archive-keyring.asc] \
1415
https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/v(=teleport.major_version=)" \
1516
| sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null
1617

docs/pages/installation.mdx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,13 @@ repositories.
241241
<TabItem label="apt">
242242

243243
```code
244+
$ mkdir -p /etc/apt/keyrings
244245
# Download the Teleport PGP public key
245246
$ sudo curl https://apt.releases.teleport.dev/gpg \
246-
-o /usr/share/keyrings/teleport-archive-keyring.asc
247+
-o /etc/apt/keyrings/teleport-archive-keyring.asc
247248
# Add the Teleport APT repository. You'll need to update this file for each
248249
# major release of Teleport.
249-
$ echo "deb [signed-by=/usr/share/keyrings/teleport-archive-keyring.asc] \
250+
$ echo "deb [signed-by=/etc/apt/keyrings/teleport-archive-keyring.asc] \
250251
https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} \
251252
${TELEPORT_CHANNEL?}" \
252253
| sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null

0 commit comments

Comments
 (0)