pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2161 from meenzen/mautrix-discord-restricted-rooms-config

Browse source 
fix(mautrix-discord): allow configuring the restricted_rooms option
This commit is contained in:
Slavi Pantaleev 2022-11-03 07:44:07 +02:00 committed by GitHub
parent c96878275c e1cfb6e79f
commit 6c131138ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
group_vars/matrix_servers
View file

@ -695,6 +695,10 @@ matrix_mautrix_discord_login_shared_secret: "{{ matrix_synapse_ext_password_prov
matrix_mautrix_discord_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}" matrix_mautrix_discord_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
matrix_mautrix_discord_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'maudiscord.db') | to_uuid }}" matrix_mautrix_discord_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'maudiscord.db') | to_uuid }}"
# Enabling bridge.restricted_rooms for this bridge does not work well with Conduit, so we disable it by default.
# This will be fixed in the upcoming `0.5.0` release of conduit.
matrix_mautrix_discord_bridge_restricted_rooms: "{{ false if matrix_homeserver_implementation == 'conduit' else true }}"
###################################################################### ######################################################################
# #
# /matrix-bridge-mautrix-discord # /matrix-bridge-mautrix-discord

4
roles/matrix-bridge-mautrix-discord/defaults/main.yml
View file

@ -140,3 +140,7 @@ matrix_mautrix_discord_registration: "{{ matrix_mautrix_discord_registration_yam
matrix_mautrix_discord_bridge_encryption_allow: false matrix_mautrix_discord_bridge_encryption_allow: false
matrix_mautrix_discord_bridge_encryption_default: "{{ matrix_mautrix_discord_bridge_encryption_allow }}" matrix_mautrix_discord_bridge_encryption_default: "{{ matrix_mautrix_discord_bridge_encryption_allow }}"
matrix_mautrix_discord_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_discord_bridge_encryption_allow }}" matrix_mautrix_discord_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_discord_bridge_encryption_allow }}"
# On conduit this option may prevent you from joining spaces created by the bridge.
# Setting this to false fixes the issue.
matrix_mautrix_discord_bridge_restricted_rooms: true

2
roles/matrix-bridge-mautrix-discord/templates/config.yaml.j2
View file

@ -101,7 +101,7 @@ bridge:
message_error_notices: true message_error_notices: true
# Should the bridge use space-restricted join rules instead of invite-only for guild rooms? # Should the bridge use space-restricted join rules instead of invite-only for guild rooms?
# This can avoid unnecessary invite events in guild rooms when members are synced in. # This can avoid unnecessary invite events in guild rooms when members are synced in.
restricted_rooms: true restricted_rooms: {{ matrix_mautrix_discord_bridge_restricted_rooms|to_json }}
# Should the bridge update the m.direct account data event when double puppeting is enabled. # Should the bridge update the m.direct account data event when double puppeting is enabled.
# Note that updating the m.direct event is not atomic (except with mautrix-asmux) # Note that updating the m.direct event is not atomic (except with mautrix-asmux)
# and is therefore prone to race conditions. # and is therefore prone to race conditions.