mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-27 19:38:29 +01:00
fa76128fd8
This supersedes/fixes-up this Pull Request: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/719 The Jitsi Web and JVB containers now (in build 5142) always start by bulding their own default configuration (`config.js` and `sip-communicator.properties`, respectively). The fact that we were generating these files ourselves was no longer of use, because our configuration was thrown away in favor of the one created by the containers on startup. With this commit, we're completely redoing things. We no longer generate these configuration files. We try to pass the proper environment variables, so that Jitsi services can generate the configuration files themselves. Besides that, we try to use the "custom configuration" mechanism provided by Jitsi Web and Jitsi JVB (`custom-config.js` and `custom-sip-communicator.properties`, respectively), so that we and our users can inject additional configuration. Some configuration options we had are gone now. Others are no longer controllable via variables and need to be injected using the `_config_extension` variables that we provide. The validation logic that is part of the role should take care to inform people about how to upgrade (if they're using some custom configuration, which needs special care now). Most users should not have to do anything special though.
16 lines
423 B
Django/Jinja
16 lines
423 B
Django/Jinja
config.defaultLanguage = {{ matrix_jitsi_web_config_defaultLanguage|to_json }};
|
|
|
|
|
|
if (!config.hasOwnProperty('p2p')) config.p2p = {% raw %}{}{% endraw %};
|
|
|
|
{% if matrix_jitsi_web_stun_servers|length > 0 %}
|
|
config.p2p.stunServers = [
|
|
{% for url in matrix_jitsi_web_stun_servers %}
|
|
{ urls: {{ url|to_json }} }{% if not loop.last %},{% endif %}
|
|
{% endfor %}
|
|
];
|
|
{% endif %}
|
|
|
|
|
|
{{ matrix_jitsi_web_custom_config_extension }}
|