Sfoglia il codice sorgente

Remove conduit workaround

Conduit update 0.5.0 fixed the issue, so this is no longer needed.
pull/2357/head
Samuel Meenzen 3 anni fa
parent
commit
0179b0f165
Non sono state trovate chiavi note per questa firma nel database ID Chiave GPG: 3B4F4FA63FB39B01
2 ha cambiato i file con 2 aggiunte e 6 eliminazioni
  1. +0
    -4
      group_vars/matrix_servers
  2. +2
    -2
      roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml

+ 0
- 4
group_vars/matrix_servers Vedi File

@@ -718,10 +718,6 @@ matrix_mautrix_discord_database_engine: "{{ 'postgres' if devture_postgres_enabl
matrix_mautrix_discord_database_hostname: "{{ devture_postgres_connection_hostname if devture_postgres_enabled else '' }}"
matrix_mautrix_discord_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'maudiscord.db', rounds=655555) | 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


+ 2
- 2
roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml Vedi File

@@ -141,6 +141,6 @@ matrix_mautrix_discord_bridge_encryption_allow: false
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 }}"

# On conduit this option may prevent you from joining spaces created by the bridge.
# Setting this to false fixes the issue.
# On conduit versions before 0.5.0 this option prevented users from joining spaces created by the bridge.
# Setting this to false fixed the issue.
matrix_mautrix_discord_bridge_restricted_rooms: true

Caricamento…
Annulla
Salva