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

Integrate prosody-plugins-contrib #1769

Merged
merged 5 commits into from
Apr 4, 2024

Conversation

denzs
Copy link
Contributor

@denzs denzs commented Mar 22, 2024

  • add /prosody-plugins-contrib to prosody config
  • unpack contrib plugins to /prosody-plugins-contrib
  • use matrix auth plugins from /prosody-plugins-contrib instead of /prosody-plugins

fixes #1571

…to prosody config, leave matrix plugins in contrib folder
@denzs denzs marked this pull request as draft March 22, 2024 13:17
@denzs denzs changed the title WIP: Integrate prosody-plugins-contrib Integrate prosody-plugins-contrib Mar 22, 2024
@denzs
Copy link
Contributor Author

denzs commented Mar 22, 2024

This PR changes the location of

  • mod_auth_hybrid_matrix_token.lua
  • mod_matrix_affiliation.lua
  • mod_matrix_lobby_bypass.lua

from /prosody-plugins to /prosody-plugins-contrib which keeps the Dockerfile cleaner and reflects their natural habitat from my point of view ;)

copy whole directory structure instead of single lua files as aaronkvanmeerten suggested

Co-authored-by: Aaron van Meerten <aaron.van.meerten@gmail.com>
@denzs
Copy link
Contributor Author

denzs commented Apr 2, 2024

Using the whole directory structure seems to work fine as you suggested :)

For testing purposes i've set

XMPP_MODULES=time_restricted
LOG_LEVEL=debug

And the container output contains

2024-04-02 07:06:31 meet.jitsi:time_restricted                                   debug	loaded

@denzs denzs marked this pull request as ready for review April 2, 2024 07:30
@denzs
Copy link
Contributor Author

denzs commented Apr 2, 2024

Any further suggestions? :)

Copy link
Member

@saghul saghul left a comment

Choose a reason for hiding this comment

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

LGTM!

@saghul saghul merged commit b0f9eb2 into jitsi:master Apr 4, 2024
1 check passed
@denzs denzs deleted the add_prosody_contrib_plugins branch April 4, 2024 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RFC: add contrib plugins to the base image
3 participants