Fix add/config based on comments by @spantaleev

This commit is contained in:
anadahz
2018-11-23 00:42:54 +00:00
parent 3cb3f17a90
commit 792bed3f5a
4 changed files with 18 additions and 42 deletions

View File

@ -10,23 +10,11 @@
"integrations_jitsi_widget_url": "{{ matrix_riot_web_integrations_jitsi_widget_url }}",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"enableLabs": true,
{% if riot_roomdir_servers is defined %}
{% for server in riot_roomdir_servers %}
"roomDirectory": {
"servers": [
"{{ server }}"
]
"servers": {{ matrix_riot_web_roomdir_servers|to_nice_yaml }}
{% if matrix_riot_web_welcome_user_id %}
},
{% endfor %}
{% else %}
"roomDirectory": {
"servers": [
"matrix.org"
]
{% endif %}
{% if riot_welcome_bot|default(true)|bool %}
},
"welcomeUserId": "@riot-bot:matrix.org"
"welcomeUserId": "{{ matrix_riot_web_welcome_user_id }}"
{% else %}
}
{% endif %}