Update matrix-appservice-irc version#3512
Update matrix-appservice-irc version#3512thomwiggers wants to merge 23 commits intospantaleev:masterfrom
matrix-appservice-irc version#3512Conversation
|
Setting up media proxy is a bit above my level |
|
I have rebased this, but would appreciate some help getting the authenticated media set up correctly |
53e5e12 to
f83dbce
Compare
|
It seems that the media proxy is indeed part of the bridge, but that you need to set up e.g. traefik to route traffic to it. This is well above my paygrade. |
6de981e to
bea4169
Compare
77980f9 to
34fab8b
Compare
|
@thomwiggers I had a shot at the traefik changes, not really tested though: https://github.com/JadedBlueEyes/matrix-docker-ansible-deploy/tree/patch-11 |
|
Thanks, that does look plausible... I hope I will have some time to test it. |
|
The following gets posted to IRC But following it just gets a 404 :( I haven't had time to dig into the logs yet. |
|
The Traefik GUI dashboard is likely to show more hints |
|
The Traefik GUI says the rule is |
|
Using which appears to result from the bridge, because:
|
|
Going off matrix-org/matrix-appservice-irc#1828 it may be that |
34fab8b to
27e320f
Compare
… naming conventions Variables that map to nested YAML config properties should follow the pattern: matrix_<component>_<configPath>_<nestedProperty> For ircService.mediaProxy.*, we now use: - matrix_appservice_irc_ircService_mediaProxy_bindPort - matrix_appservice_irc_ircService_mediaProxy_publicUrl_hostname - matrix_appservice_irc_ircService_mediaProxy_publicUrl_pathPrefix This follows the existing pattern used by matrix_appservice_irc_ircService_servers and similar variables in other roles (e.g., matrix_hookshot_github_defaultOptions_*). Also renamed the Traefik path prefix variable to include 'media_proxy' for clarity: - matrix_appservice_irc_container_labels_media_proxy_traefik_path_prefix
Instead of hardcoding 'https' in the publicUrl, introduce a scheme variable that can be configured. This follows the pattern used by other roles (e.g., matrix_mautrix_discord_scheme, matrix_hookshot_public_scheme). New variables: - matrix_appservice_irc_ircService_mediaProxy_publicUrl_scheme (defaults to https) - matrix_appservice_irc_ircService_mediaProxy_publicUrl (combines scheme, hostname, pathPrefix) The scheme is wired in group_vars/matrix_servers based on matrix_playbook_ssl_enabled, consistent with how other roles handle this.
Role defaults should not reference playbook-level variables like matrix_playbook_reverse_proxy_type or traefik_entrypoint_primary, as this breaks standalone usage of the role. Following the pattern established by other roles (matrix-sliding-sync, matrix-synapse-admin, matrix-media-repo, etc.), Traefik variables now use safe standalone defaults (true, web-secure, default) while the actual playbook wiring remains in group_vars/matrix_servers. Also standardized certResolver variable naming to use camelCase, consistent with other roles in the playbook.
…Prefix Instead of hardcoding '/irc' in two places, the Traefik path prefix is now derived from the mediaProxy publicUrl_pathPrefix variable by stripping the trailing slash (Traefik paths must not end with a slash, except for '/'). Added validation to ensure: - publicUrl_pathPrefix starts and ends with a slash (required by the service) - Traefik path prefix doesn't end with a slash (consistent with other roles)
…media_url The matrix_appservice_irc_homeserver_media_url variable was removed and replaced by the new mediaProxy configuration. Users who had this variable set will now get a helpful message pointing them to the new approach.
Update copyright year ranges to reflect actual contributions: - Thom Wiggers contributions extended to 2026 - Slavi Pantaleev contributions extended to 2026 - Added Jade Ellis as original author of labels.j2
|
Thanks for the contribution! I've made some adjustments on top of your work to improve consistency with the rest of the playbook:
Squash-merged now. Thanks again to you and @JadedBlueEyes! |
The update to
3.0brings with it that it now uses MediaProxy.