Skip to content

Commit abf2f73

Browse files
committed
jicofo: fix setting incorrect auth URL scheme for JWT
1 parent 3472ab0 commit abf2f73

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ services:
115115
volumes:
116116
- ${CONFIG}/jicofo:/config:Z
117117
environment:
118+
- AUTH_TYPE
118119
- ENABLE_AUTH
119120
- XMPP_DOMAIN
120121
- XMPP_AUTH_DOMAIN

jicofo/rootfs/defaults/sip-communicator.properties

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,21 @@ org.jitsi.jicofo.jibri.PENDING_TIMEOUT={{ .Env.JIBRI_PENDING_TIMEOUT }}
1010
org.jitsi.jicofo.jigasi.BREWERY={{ .Env.JIGASI_BREWERY_MUC}}@{{ .Env.XMPP_INTERNAL_MUC_DOMAIN }}
1111
{{ end }}
1212

13-
{{ if .Env.ENABLE_AUTH | default "0" | toBool }}
14-
org.jitsi.jicofo.auth.URL=XMPP:{{ .Env.XMPP_DOMAIN }}
15-
{{ end }}
16-
1713
{{ if .Env.JICOFO_RESERVATION_REST_BASE_URL }}
1814
org.jitsi.impl.reservation.rest.BASE_URL={{ .Env.JICOFO_RESERVATION_REST_BASE_URL }}
1915
{{ end }}
2016

2117
{{ if .Env.JICOFO_ENABLE_HEALTH_CHECKS | default "0" | toBool }}
2218
org.jitsi.jicofo.health.ENABLE_HEALTH_CHECKS=true
2319
{{ end }}
20+
21+
{{ $ENABLE_AUTH := .Env.ENABLE_AUTH | default "0" | toBool }}
22+
{{ $AUTH_TYPE := .Env.AUTH_TYPE | default "internal" }}
23+
24+
{{ if $ENABLE_AUTH }}
25+
{{ if eq $AUTH_TYPE "jwt" }}
26+
org.jitsi.jicofo.auth.URL=EXT_JWT:{{ .Env.XMPP_DOMAIN }}
27+
{{ else }}
28+
org.jitsi.jicofo.auth.URL=XMPP:{{ .Env.XMPP_DOMAIN }}
29+
{{ end }}
30+
{{ end }}

0 commit comments

Comments
 (0)