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.

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

jitsi-meet: Update list of enabled Prosody modules #264400

Closed
wants to merge 5 commits into from

Conversation

ntninja
Copy link
Contributor

@ntninja ntninja commented Oct 30, 2023

Description of changes

Update the list of enabled extraModules and instantiated components in Prosody by the jitsi-meet service to match those default-enabled by the official Jitsi Meet Prosody Docker container: https://github.com/jitsi/docker-jitsi-meet/blob/8555fe1c4a7ea434960ec61e7774f1091400d16a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua#L178-L216

Modules already enabled in the Prosody base configuration of NixOS (including “smacks”) were not included in the extraModules. This makes the speaker stats work in the UI (bug fix) and is also part of the prerequirements for the Whiteboard (which requires a bunch of further configuration). Only modules enabled in the minimal Docker image are enabled here, breakout rooms etc would require more modules and config but are not part of the base set so were not considered.The jitsi_session module is manually enabled due to the shipped room_metadata missing a dependency on it – this prevented the whiteboard from working for a completely non-obvious reason and has been fixed only in latest upstream master. Some MUC configuration set in the Docker image was also carried over while I was at it, even if it doesn’t appear to change anything noticable…

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 23.11 Release Notes (or backporting 23.05 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.

@cleeyv @ryantm

EDIT: Added component instantiations for the added modules and some minor MUC customization done by upstream. Also added workaround for missing dependency of room_metadata module on jitsi_session (upstream bug fixed in latest master).

@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 Oct 30, 2023
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Oct 30, 2023
@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 Oct 30, 2023
Docker image does this and it at least makes the speaker stats work in the UI (bug fix) and also is also part of the prerequirements for enabling the Whiteboard
…her Jitsi modules depend on it

At least room_metadata is confirmed to not do anything unless this module is also enabled: jitsi/jitsi-meet#14001 (comment)
@ntninja
Copy link
Contributor Author

ntninja commented Nov 1, 2023

I think this PR is good now, I still have local changes for enabling the whiteboard and Secure Domain authentication with Prosody internal credentials, but I’ll save those for subsequent PRs since those are both optional extra components and at least the whiteboard requires the metadata module enabled here.

@ntninja
Copy link
Contributor Author

ntninja commented Jan 12, 2024

Superseeded by #280615.

@ntninja ntninja closed this Jan 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants