Просмотр исходного кода

Actually make use of the matrix_mautrix_discord_bridge_double_puppet_server_map variable

pull/3850/head
Slavi Pantaleev 1 год назад
Родитель
Сommit
34d1586f25
2 измененных файлов: 12 добавлений и 4 удалений
  1. +11
    -2
      roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml
  2. +1
    -2
      roles/custom/matrix-bridge-mautrix-discord/templates/config.yaml.j2

+ 11
- 2
roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml Просмотреть файл

@@ -104,9 +104,18 @@ matrix_mautrix_discord_bridge_login_shared_secret_map: "{{ matrix_mautrix_discor
matrix_mautrix_discord_bridge_login_shared_secret_map_auto: {} matrix_mautrix_discord_bridge_login_shared_secret_map_auto: {}
matrix_mautrix_discord_bridge_login_shared_secret_map_custom: {} matrix_mautrix_discord_bridge_login_shared_secret_map_custom: {}



# Servers to always allow double puppeting from # Servers to always allow double puppeting from
matrix_mautrix_discord_bridge_double_puppet_server_map:
"{{ matrix_mautrix_discord_homeserver_domain : matrix_mautrix_discord_homeserver_address }}"
matrix_mautrix_discord_bridge_double_puppet_server_map: "{{ matrix_mautrix_discord_bridge_double_puppet_server_map_default | combine(matrix_mautrix_discord_bridge_double_puppet_server_map_auto) | combine(matrix_mautrix_discord_bridge_double_puppet_server_map_custom) }}"
matrix_mautrix_discord_bridge_double_puppet_server_map_default: |-
{{
{}
| combine({
matrix_beeper_linkedin_homeserver_domain: matrix_beeper_linkedin_homeserver_address
})
}}
matrix_mautrix_discord_bridge_double_puppet_server_map_auto: {}
matrix_mautrix_discord_bridge_double_puppet_server_map_custom: {}


# Default mautrix-discord configuration template which covers the generic use case. # Default mautrix-discord configuration template which covers the generic use case.
# You can customize it by controlling the various variables inside it. # You can customize it by controlling the various variables inside it.


+ 1
- 2
roles/custom/matrix-bridge-mautrix-discord/templates/config.yaml.j2 Просмотреть файл

@@ -173,8 +173,7 @@ bridge:
height: 320 height: 320
fps: 25 # only for webm, webp and gif (2, 5, 10, 20 or 25 recommended) fps: 25 # only for webm, webp and gif (2, 5, 10, 20 or 25 recommended)
# Servers to always allow double puppeting from # Servers to always allow double puppeting from
double_puppet_server_map:
"{{ matrix_mautrix_discord_homeserver_domain }}": {{ matrix_mautrix_discord_homeserver_address }}
double_puppet_server_map: {{ matrix_mautrix_discord_bridge_double_puppet_server_map | to_json }}
# Allow using double puppeting from any server with a valid client .well-known file. # Allow using double puppeting from any server with a valid client .well-known file.
double_puppet_allow_discovery: false double_puppet_allow_discovery: false
# Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth


Загрузка…
Отмена
Сохранить