diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-07-08 16:57:10 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-07-08 16:57:10 +0100 |
| commit | ef5ed5292be19637b293a9dc2a3abeed6a156bd4 (patch) | |
| tree | 2687bdbfb2813e4b25b29ff65b99e2943b720e41 | |
| parent | Do not use simplejson in Synapse. (#7800) (diff) | |
| download | synapse-ef5ed5292be19637b293a9dc2a3abeed6a156bd4.tar.xz | |
Revert "Update the installation docs on apt-transport-https (#7801)"
This reverts commit e0c01296936a178d83556fc4f00f69e429fa7ba5. As discussed at https://github.com/matrix-org/synapse/pull/7801#pullrequestreview-444652786, I don't think this is an improvement.
Diffstat (limited to '')
| -rw-r--r-- | INSTALL.md | 11 | ||||
| -rw-r--r-- | changelog.d/7801.doc | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/INSTALL.md b/INSTALL.md index 38af275fc2..ef80a26c3f 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -259,17 +259,6 @@ 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 deleted file mode 100644 index 9e5cebf3ef..0000000000 --- a/changelog.d/7801.doc +++ /dev/null @@ -1 +0,0 @@ -Change the installation documentation regarding the `apt-transport-https` package, which is no longer needed on Debian 10/Ubuntu 18.04 and newer. |