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

jitsi-meet: Default NAT harvester, Excalidraw Caddy, Prosody lockdown #280615

Merged
merged 6 commits into from
Oct 2, 2024
Merged

jitsi-meet: Default NAT harvester, Excalidraw Caddy, Prosody lockdown #280615

merged 6 commits into from
Oct 2, 2024

Conversation

ntninja
Copy link
Contributor

@ntninja ntninja commented Jan 12, 2024 •
edited
Loading

Description of changes

Several smaller changes to the Jitsi Meet modules (one commit each):

  • Added an internal MUC setting in the Jitsi Meet Docker package that hadn’t been included in the recent updates (originally from jitsi-meet: Update list of enabled Prosody modules #264400)
  • Add default-enabled option to configure a NAT harvester addresses to make Jitsi Videobridge work in behind a NAT without manual address configuration
  • Update the Jitsi Meet Caddy configuration to also forward the Excalidraw WebSocket configuration there if the whiteboard is enabled
  • Don’t run the Jitsi Excalidraw backend service as root with maximum privileges
  • Add default-disabled option to disable unnecessary Prosody services when Prosody is only used for Jitsi Meet

Are the added options significant enough for the release notes?

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@cleeyv @ryantm

@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 Jan 12, 2024
@ntninja ntninja mentioned this pull request Jan 12, 2024
Closed
13 tasks
@ntninja ntninja force-pushed the patch-jitsi-meet-2 branch 2 times, most recently from 24d630f to f78a992 Compare January 12, 2024 23:47
@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 Jan 13, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 3, 2024
@ntninja ntninja force-pushed the patch-jitsi-meet-2 branch from 3f5ffd9 to 9cd1608 Compare July 7, 2024 12:49
@ntninja
Copy link
Contributor Author

ntninja commented Jul 7, 2024

Rebased to latest unstable

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 7, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 8, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 27, 2024
@ntninja ntninja force-pushed the patch-jitsi-meet-2 branch 2 times, most recently from 768976b to 93f8d8a Compare September 30, 2024 15:37
@ntninja
jitsi-videobridge: Set configurable default NAT harvester address to …
61cf882 
…make the

service work behind NAT without additional manual configuration
@ntninja
jitsi-meet: Also forward Excalidraw connections when using Caddy as w…
9e8b3f9 
…eb server
@ntninja
jitsi-meet: Restrict jitsi-excalidraw systemd service to the minimum …
7ab8f25 
…requried
@ntninja
jitsi-meet: Add option to disable Prosody services not used by Jitsi …
5658158 
…Meet

The default Prosody config assumes that Prosody will be used as a federated
XMPP server, while the usecase for Jitsi Meet is much narrower.
@ntninja
jitsi-meet: Only run smoke test on Linux
40c1971 
The smoke test requires running Jitsi Videobridge and Jicofo, which are
Linux-only and don’t work on macos.
@ntninja
Copy link
Contributor Author

ntninja commented Sep 30, 2024

Rebased again

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 30, 2024
@Lassulus Lassulus merged commit def08aa into NixOS:master Oct 2, 2024
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lassulus Lassulus Lassulus approved these changes

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 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ntninja @Lassulus @wegank