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

Merge pull request #160 from danbob/fix-matrix-mxisd-config

Fix template indentation
pull/167/head
Slavi Pantaleev 6 лет назад
committed by GitHub
Родитель
Сommit
5f2f17cb1e
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 4AEE18F83AFDEB23
3 измененных файлов: 3 добавлений и 2 удалений
  1. +1
    -2
      roles/matrix-dimension/defaults/main.yml
  2. +1
    -0
      roles/matrix-mxisd/defaults/main.yml
  3. +1
    -0
      roles/matrix-synapse/defaults/main.yml

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

@@ -34,6 +34,7 @@ matrix_dimension_integrations_jitsi_widget_url: "https://{{ matrix_server_fqn_di
# For a more advanced customization, you can extend the default (see `matrix_dimension_configuration_extension_yaml`)
# or completely replace this variable with your own template.
matrix_dimension_configuration_yaml: |
#jinja2: lstrip_blocks: True
# The web settings for the service (API and UI).
# It is best to have this run on localhost and use a reverse proxy to access Dimension.
web:
@@ -128,5 +129,3 @@ matrix_dimension_configuration_extension_yaml: |
# 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`.
matrix_dimension_configuration: "{{ matrix_dimension_configuration_yaml|from_yaml|combine(matrix_dimension_configuration_extension, recursive=True) }}"



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

@@ -67,6 +67,7 @@ matrix_mxisd_self_check_validate_certificates: true
# For a more advanced customization, you can extend the default (see `matrix_mxisd_configuration_extension_yaml`)
# or completely replace this variable with your own template.
matrix_mxisd_configuration_yaml: |
#jinja2: lstrip_blocks: True
matrix:
domain: {{ matrix_domain }}



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

@@ -270,6 +270,7 @@ matrix_appservice_irc_docker_image: "tedomum/matrix-appservice-irc:latest"
matrix_appservice_irc_base_path: "{{ matrix_base_data_path }}/appservice-irc"

matrix_appservice_irc_configuration_yaml: |
#jinja2: lstrip_blocks: True
homeserver:
url: "https://{{ matrix_server_fqn_matrix }}"
domain: "{{ matrix_domain }}"


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