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

Jump to bottom

nixos/mautrix-telegram: doc update and cleanup #201560

Merged
merged 3 commits into from
Nov 21, 2022
Merged

nixos/mautrix-telegram: doc update and cleanup #201560

merged 3 commits into from
Nov 21, 2022

Conversation

pacien
Copy link
Contributor

@pacien pacien commented Nov 16, 2022

CRTified and others added 3 commits November 16, 2022 23:18
@CRTified @pacien
nixos/mautrix-telegram: add documentation for setting arbitrary secrets
6070b99 
The change that allows setting the secrets by an environment file had
the undocumented side effect of allowing to set any key by the environment
file (Related PR: mautrix/telegram#332).

This is required to e.g. set `bridge.login_shared_secret`, which was not
documented before.

GitHub: closes NixOS#103347
@pacien
Revert "nixos/mautrix-telegram: substitute secrets in config file at …
8c8e72b 
…runtime (NixOS#112966)"

This is no longer necessary since mautrix-telegram v0.12.1, which
supports JSON-formatted environment variable and therefore maps
natively.

See: mautrix/telegram#584 (comment)
See: https://github.com/mautrix/telegram/releases/tag/v0.12.1

This partially reverts commit 24133ea.
@pacien
nixos/mautrix-telegram: document JSON env var config
ab8ea16 
This was introduced in mautrix-telegram v0.12.1.

See: mautrix/telegram#584 (comment)
See: https://github.com/mautrix/telegram/releases/tag/v0.12.1
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 16, 2022
@pacien pacien changed the title mautrix telegram doc cleanup nixos/mautrix-telegram: doc update and cleanup Nov 16, 2022
@pacien pacien requested a review from Vskilet November 16, 2022 22:23
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 16, 2022
CRTified
CRTified approved these changes Nov 20, 2022
View reviewed changes
Copy link
Contributor

@CRTified CRTified left a comment

Choose a reason for hiding this comment

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

The code changes only revert the nix-specific substitution method, so this will be fine. Everything else relies on (new) upstream features, so there is not much that can break. I currently don't have time to test the code.

The upstream documentation does not seem to have anything about json:: substitutions, but the author of the bridge describes the format here (also linked in the commit messages).

Assuming that @pacien likely tested this modification, I think it is ready to merge.

@pacien
Copy link
Contributor Author

pacien commented Nov 20, 2022 via email

winterqt
winterqt approved these changes Nov 21, 2022
View reviewed changes
Copy link
Member

@winterqt winterqt left a comment

Choose a reason for hiding this comment

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

Thanks!

@winterqt winterqt merged commit 4cdc08f into NixOS:master Nov 21, 2022
@winterqt
Copy link
Member

(Out of curiosity, where did the first commit by @CRTified come from? e.g. I don't see another PR it was taken from.)

@pacien
Copy link
Contributor Author

pacien commented Nov 21, 2022 via email

@CRTified
Copy link
Contributor

And for completeness: My PR got closed as an automatic action in the commit message from 6070b99.

@Luflosi
Copy link
Contributor

Luflosi commented Dec 21, 2022

This did not work for me at all, see mautrix/telegram#584 (comment).
Can anyone reproduce the issue?
I put MAUTRIX_TELEGRAM_BRIDGE_LOGIN_SHARED_SECRET_MAP='json::{"mydomain.com":"mysecret"}' into the file specified with environmentFile and removed the obsolete config file at /var/lib/mautrix-telegram/config.json.
After patching mautrix with my patch in the linked issue, it seems to work. I wasted several hours trying to create an overlay for mautrix because pkgs/servers/mautrix-telegram/default.nix also has a python override.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@winterqt winterqt winterqt approved these changes

@CRTified CRTified CRTified approved these changes

@Ma27 Ma27 Awaiting requested review from Ma27

@Vskilet Vskilet Awaiting requested review from Vskilet

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pacien @winterqt @CRTified @Luflosi