Skip to content

Commit bda1502

Browse files
committed
prosody: simplify code
We no longer need to use token based auth (but allow empty tokens) when WebSockets are used.
1 parent cfd8d3c commit bda1502

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
8080
authentication = "{{ $JWT_AUTH_TYPE }}"
8181
app_id = "{{ .Env.JWT_APP_ID }}"
8282
app_secret = "{{ .Env.JWT_APP_SECRET }}"
83-
allow_empty_token = {{ if $JWT_ALLOW_EMPTY }}true{{ else }}false{{ end }}
83+
allow_empty_token = {{ $JWT_ALLOW_EMPTY }}
8484
{{ if $JWT_ASAP_KEYSERVER }}
8585
asap_key_server = "{{ .Env.JWT_ASAP_KEYSERVER }}"
8686
{{ end }}
@@ -93,15 +93,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
9393
authentication = "internal_hashed"
9494
{{ end }}
9595
{{ else }}
96-
-- https://github.com/jitsi/docker-jitsi-meet/pull/502#issuecomment-619146339
97-
{{ if $ENABLE_XMPP_WEBSOCKET }}
98-
authentication = "token"
99-
{{ else }}
100-
authentication = "anonymous"
101-
{{ end }}
102-
app_id = ""
103-
app_secret = ""
104-
allow_empty_token = true
96+
authentication = "jitsi-anonymous"
10597
{{ end }}
10698
ssl = {
10799
key = "/config/certs/{{ .Env.XMPP_DOMAIN }}.key";
@@ -153,15 +145,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
153145

154146
{{ if $ENABLE_GUEST_DOMAIN }}
155147
VirtualHost "{{ .Env.XMPP_GUEST_DOMAIN }}"
156-
-- https://github.com/jitsi/docker-jitsi-meet/pull/502#issuecomment-619146339
157-
{{ if $ENABLE_XMPP_WEBSOCKET }}
158-
authentication = "token"
159-
{{ else }}
160-
authentication = "anonymous"
161-
{{ end }}
162-
app_id = ""
163-
app_secret = ""
164-
allow_empty_token = true
148+
authentication = "jitsi-anonymous"
165149

166150
c2s_require_encryption = false
167151
{{ end }}

0 commit comments

Comments
 (0)