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

Merge pull request #434 from teutat3s/missing_jitsi_jicofo_auth_url

Browse source 
add missing jitsi auth URL conditional
This commit is contained in:
Slavi Pantaleev 2020-04-04 09:48:39 +03:00 committed by GitHub
parent 7aa74e32b2 9adddb19e2
commit 5cca71e8da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/matrix-jitsi/templates/jicofo/sip-communicator.properties.j2
View file

@ -3,3 +3,7 @@ org.jitsi.jicofo.BRIDGE_MUC={{ matrix_jitsi_jvb_brewery_muc }}@{{ matrix_jitsi_x
org.jitsi.jicofo.jibri.BREWERY={{ matrix_jitsi_jibri_brewery_muc }}@{{ matrix_jitsi_xmpp_internal_muc_domain }} org.jitsi.jicofo.jibri.BREWERY={{ matrix_jitsi_jibri_brewery_muc }}@{{ matrix_jitsi_xmpp_internal_muc_domain }}
org.jitsi.jicofo.jibri.PENDING_TIMEOUT=90 org.jitsi.jicofo.jibri.PENDING_TIMEOUT=90
{% if matrix_jitsi_enable_auth %}
org.jitsi.jicofo.auth.URL=XMPP:{{ matrix_jitsi_xmpp_domain }}
{% endif %}

2
roles/matrix-jitsi/templates/web/config.js.j2
View file

@ -21,7 +21,7 @@ var config = {
{% if matrix_jitsi_enable_auth %} {% if matrix_jitsi_enable_auth %}
{% if matrix_jitsi_enable_guests %} {% if matrix_jitsi_enable_guests %}
// When using authentication, domain for guest users. // When using authentication, domain for guest users.
anonymousdomain: '{{ matrix_jitsi_xmpp_guest_domain }}', anonymousdomain: '{{ matrix_jitsi_xmpp_guest_domain }}',
{% endif %} {% endif %}
// Domain for authenticated users. Defaults to <domain>. // Domain for authenticated users. Defaults to <domain>.