finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Fix template indentation
This commit is contained in:
Slavi Pantaleev 2019-05-08 08:01:00 +03:00 committed by GitHub
commit 5f2f17cb1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/matrix-dimension/defaults/main.yml
View File

@ -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`) # 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. # or completely replace this variable with your own template.
matrix_dimension_configuration_yaml: | matrix_dimension_configuration_yaml: |
#jinja2: lstrip_blocks: True
# The web settings for the service (API and UI). # 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. # It is best to have this run on localhost and use a reverse proxy to access Dimension.
web: web:
@ -128,5 +129,3 @@ matrix_dimension_configuration_extension_yaml: |
# Holds the final Dimension configuration (a combination of the default and its extension). # 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`. # 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) }}" matrix_dimension_configuration: "{{ matrix_dimension_configuration_yaml|from_yaml|combine(matrix_dimension_configuration_extension, recursive=True) }}"

1
roles/matrix-mxisd/defaults/main.yml
View File

@ -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`) # 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. # or completely replace this variable with your own template.
matrix_mxisd_configuration_yaml: | matrix_mxisd_configuration_yaml: |
#jinja2: lstrip_blocks: True
matrix: matrix:
domain: {{ matrix_domain }} domain: {{ matrix_domain }}

1
roles/matrix-synapse/defaults/main.yml
View File

@ -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_base_path: "{{ matrix_base_data_path }}/appservice-irc"
matrix_appservice_irc_configuration_yaml: | matrix_appservice_irc_configuration_yaml: |
#jinja2: lstrip_blocks: True
homeserver: homeserver:
url: "https://{{ matrix_server_fqn_matrix }}" url: "https://{{ matrix_server_fqn_matrix }}"
domain: "{{ matrix_domain }}" domain: "{{ matrix_domain }}"