Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update installation instructions with new repo #9500

Merged
merged 4 commits into from
Apr 17, 2019
Merged

update installation instructions with new repo #9500

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
261974e
update installation instructions with new repo
axelsimon Apr 16, 2019
147f77f
Update README.md
dbkr Apr 16, 2019
6c95059
the repo key filename changed, reflecting this
axelsimon Apr 16, 2019
434e8cc
Changed the Debian repo key and public key URLs
axelsimon Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ released version of Riot:
as desired. See below for details.
1. Enter the URL into your browser and log into Riot!

Releases are signed by PGP, and can be checked against the public key
at https://riot.im/packages/keys/riot.asc .
Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located
at https://packages.riot.im/debian/riot.im-archive-keyring.asc .
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't exist, did you mean riot-im-archive-keyring.asc ? Also someone is going to have to explain to me the difference between that and https://packages.riot.im/riot-release-key.asc

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Thanks.
I really meant https://packages.riot.im/riot-release-key.asc, I'll amend.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

given that's also Dave's suggestion, I'm inclined to trust that too :D

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we've got https://packages.riot.im/riot-release-key.asc for the general package signing and https://packages.riot.im/debian/riot.im-archive-keyring.asc as the key to add to apt's key store, on Debian. Correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those sound like the right things to me

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that's right - the signing keys are now separate with one the one in /debian for the debian repo and the release key for signing the web release tarballs.


Note that Chrome does not allow microphone or webcam access for sites served
over http (except localhost), so for working VoIP you will need to serve Riot
Expand All @@ -34,11 +34,18 @@ over https.
### Desktop Installation for Debian Stretch

1. Add the repository to your sources.list using either of the following two options:
- Directly to sources.list: `echo "deb https://riot.im/packages/debian/ stretch main" | sudo tee -a /etc/apt/sources.list`
- As a separate entry in sources.list.d: `echo "deb https://riot.im/packages/debian/ stretch main" | sudo tee /etc/apt/sources.list.d/riot.list`
2. Add the gpg signing key for the riot repository: `curl -s https://riot.im/packages/debian/repo-key.asc | sudo apt-key add -`
3. Update your package lists: `sudo apt-get update`
4. Install Riot: `sudo apt-get install riot-web`
- Directly to sources.list:
`echo "deb https://packages.riot.im/debian/ stretch main" | sudo tee -a /etc/apt/sources.list`
- As a separate entry in sources.list.d:
`echo "deb https://packages.riot.im/debian/ stretch main" | sudo tee /etc/apt/sources.list.d/riot.list`
2. Download and add the gpg signing key used to authenticate the packages from the riot repository to your system's list of trusted keys:
`curl -s https://packages.riot.im/debian/riot.im-archive-keyring.asc | sudo apt-key add -`
- Optional: if you had the old Riot.im signing key in your apt keyring, delete it, as it is no longer considered trusted:
`sudo apt-key del 48E8F4A1`
3. Update your package lists:
`sudo apt update`
4. Install Riot:
`sudo apt install riot-web`

Important Security Note
=======================
Expand Down