diff options
| author | Dirk Heinrichs <dirk.heinrichs@altum.de> | 2020-07-08 12:34:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 11:34:13 +0100 |
| commit | e0c01296936a178d83556fc4f00f69e429fa7ba5 (patch) | |
| tree | bc27060f8cb67291779f71af6c3fb11563de5432 | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-e0c01296936a178d83556fc4f00f69e429fa7ba5.tar.xz | |
Update the installation docs on apt-transport-https (#7801)
* Starting with apt 1.6, https support has moved into the main package and apt-transport-https has become a transitional dummy package. Signed-off-by: Dirk Heinrichs <dirk.heinrichs@altum.de>
Diffstat (limited to '')
| -rw-r--r-- | INSTALL.md | 11 | ||||
| -rw-r--r-- | changelog.d/7801.doc | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/INSTALL.md b/INSTALL.md index ef80a26c3f..38af275fc2 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -259,6 +259,17 @@ Synapse via https://packages.matrix.org/debian/. They are available for Debian ``` sudo apt install -y lsb-release wget apt-transport-https +``` + +for Debian/Ubuntu versions shipping `apt` < 1.6 (Debian < 10 / Ubuntu < 18.04), or + +``` +sudo apt install -y lsb-release wget +``` + +for Debian 10 / Ubuntu 18.04 and newer, followed by + +``` sudo wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg echo "deb [signed-by=/usr/share/keyrings/matrix-org-archive-keyring.gpg] https://packages.matrix.org/debian/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/matrix-org.list diff --git a/changelog.d/7801.doc b/changelog.d/7801.doc new file mode 100644 index 0000000000..9e5cebf3ef --- /dev/null +++ b/changelog.d/7801.doc @@ -0,0 +1 @@ +Change the installation documentation regarding the `apt-transport-https` package, which is no longer needed on Debian 10/Ubuntu 18.04 and newer. |