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

Fix undefined variables in mxisd and Dimension configuration

pull/196/head
Slavi Pantaleev 6 лет назад
Родитель
Сommit
328d981b05
4 измененных файлов: 5 добавлений и 2 удалений
  1. +1
    -1
      roles/matrix-bridge-appservice-discord/defaults/main.yml
  2. +1
    -1
      roles/matrix-bridge-appservice-irc/defaults/main.yml
  3. +1
    -0
      roles/matrix-dimension/defaults/main.yml
  4. +2
    -0
      roles/matrix-mxisd/defaults/main.yml

+ 1
- 1
roles/matrix-bridge-appservice-discord/defaults/main.yml Просмотреть файл

@@ -128,6 +128,6 @@ matrix_appservice_discord_configuration_extension_yaml: |
# # fininished handling it, causing us to echo it back to the room)
# discordSendDelay: 750

matrix_appservice_discord_configuration_extension: "{{ matrix_appservice_discord_configuration_extension_yaml|from_yaml if matrix_appservice_discord_configuration_extension_yaml|from_yaml else {} }}"
matrix_appservice_discord_configuration_extension: "{{ matrix_appservice_discord_configuration_extension_yaml|from_yaml if matrix_appservice_discord_configuration_extension_yaml|from_yaml is mapping else {} }}"

matrix_appservice_discord_configuration: "{{ matrix_appservice_discord_configuration_yaml|from_yaml|combine(matrix_appservice_discord_configuration_extension, recursive=True) }}"

+ 1
- 1
roles/matrix-bridge-appservice-irc/defaults/main.yml Просмотреть файл

@@ -433,6 +433,6 @@ matrix_appservice_irc_configuration_extension_yaml: |
# # the database.
# #

matrix_appservice_irc_configuration_extension: "{{ matrix_appservice_irc_configuration_extension_yaml|from_yaml if matrix_appservice_irc_configuration_extension_yaml|from_yaml else {} }}"
matrix_appservice_irc_configuration_extension: "{{ matrix_appservice_irc_configuration_extension_yaml|from_yaml if matrix_appservice_irc_configuration_extension_yaml|from_yaml is mapping else {} }}"

matrix_appservice_irc_configuration: "{{ matrix_appservice_irc_configuration_yaml|from_yaml|combine(matrix_appservice_irc_configuration_extension, recursive=True) }}"

+ 1
- 0
roles/matrix-dimension/defaults/main.yml Просмотреть файл

@@ -128,6 +128,7 @@ matrix_dimension_configuration_extension_yaml: |
# botToken: "YourTokenHere"
#

matrix_dimension_configuration_extension: "{{ matrix_dimension_configuration_extension_yaml|from_yaml if matrix_dimension_configuration_extension_yaml|from_yaml is mapping else {} }}"

# Holds the final Dimension configuration (a combination of the default and its extension).
# You most likely don't need to touch this variable. Instead, see `matrix_dimension_configuration_yaml`.


+ 2
- 0
roles/matrix-mxisd/defaults/main.yml Просмотреть файл

@@ -161,6 +161,8 @@ matrix_mxisd_configuration_extension_yaml: |
# bindDn: CN=My Mxisd User,OU=Users,DC=example,DC=org
# bindPassword: TheUserPassword

matrix_mxisd_configuration_extension: "{{ matrix_mxisd_configuration_extension_yaml|from_yaml if matrix_mxisd_configuration_extension_yaml|from_yaml is mapping else {} }}"

# Holds the final mxisd configuration (a combination of the default and its extension).
# You most likely don't need to touch this variable. Instead, see `matrix_mxisd_configuration_yaml`.
matrix_mxisd_configuration: "{{ matrix_mxisd_configuration_yaml|from_yaml|combine(matrix_mxisd_configuration_extension, recursive=True) }}"

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