pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix |to_nice_yaml breaking formatting

Browse source 
Well, actually 8cd9cde won't work, unless we put the
`|to_nice_yaml` thing on a new line.

We can, but that takes more lines and makes things look uglier.
Using `|to_json` seems good enough.

The whole file is parsed as YAML later on and merged with the
`_extension` variable before being dumped as YAML again in the end.
This commit is contained in:
Slavi Pantaleev 2020-04-18 11:06:53 +03:00
parent 8cd9cdead0
commit c13c29f48e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
View file

@ -968,7 +968,7 @@ account_validity:
# - email # - email
# - msisdn # - msisdn
{% if matrix_synapse_registrations_require_3pid|length > 0 %} {% if matrix_synapse_registrations_require_3pid|length > 0 %}
registrations_require_3pid: {{ matrix_synapse_registrations_require_3pid|to_nice_yaml }} registrations_require_3pid: {{ matrix_synapse_registrations_require_3pid|to_json }}
{% endif %} {% endif %}
# Explicitly disable asking for MSISDNs from the registration # Explicitly disable asking for MSISDNs from the registration
@ -987,7 +987,7 @@ registrations_require_3pid: {{ matrix_synapse_registrations_require_3pid|to_nice
# - medium: msisdn # - medium: msisdn
# pattern: '\+44' # pattern: '\+44'
{% if matrix_synapse_allowed_local_3pids|length > 0 %} {% if matrix_synapse_allowed_local_3pids|length > 0 %}
allowed_local_3pids: {{ matrix_synapse_allowed_local_3pids|to_nice_yaml }} allowed_local_3pids: {{ matrix_synapse_allowed_local_3pids|to_json }}
{% endif %} {% endif %}
# Enable 3PIDs lookup requests to identity servers from this server. # Enable 3PIDs lookup requests to identity servers from this server.