Skip to content

Commit 77b174b

Browse files
committed
fix(prosody): Fix missing defaults based on prosody mode.
1 parent 2c31c4c commit 77b174b

File tree

1 file changed

+16
-1
lines changed
  • prosody/rootfs/etc/services.d/70-register-setup

1 file changed

+16
-1
lines changed

prosody/rootfs/etc/services.d/70-register-setup/run

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,22 @@ if [ $ATTEMPT -eq $MAX_ATTEMPTS ]; then
2323
exit 1
2424
fi
2525

26+
[ -z "$PROSODY_MODE" ] && export PROSODY_MODE="client"
27+
28+
if [[ "$PROSODY_MODE" == "visitors" ]]; then
29+
echo "Prosody visitor mode, using alternate config"
30+
# force jicofo into auth domain for visitor-mode prosody
31+
[ -z "$XMPP_AUTH_DOMAIN" ] && XMPP_AUTH_DOMAIN="auth.meet.jitsi"
32+
elif [[ "$PROSODY_MODE" == "brewery" ]]; then
33+
echo "Prosody brewery mode, using alternate config"
34+
# force jicofo into auth domain for brewer prosody
35+
[ -z "$JVB_XMPP_AUTH_DOMAIN" ] && JVB_XMPP_AUTH_DOMAIN="auth.meet.jitsi"
36+
# ensure proper certs are generated
37+
export XMPP_AUTH_DOMAIN="$JVB_XMPP_AUTH_DOMAIN"
38+
else
39+
echo "Prosody normal mode, using default config"
40+
fi
41+
2642
# Set defaults (matching init script)
2743
[ -z "${JIBRI_RECORDER_USER}" ] && export JIBRI_RECORDER_USER=recorder
2844
[ -z "${JIBRI_XMPP_USER}" ] && export JIBRI_XMPP_USER=jibri
@@ -32,7 +48,6 @@ fi
3248
[ -z "${XMPP_AUTH_DOMAIN}" ] && XMPP_AUTH_DOMAIN=auth.meet.jitsi
3349
[ -z "${XMPP_HIDDEN_DOMAIN}" ] && XMPP_HIDDEN_DOMAIN="$XMPP_RECORDER_DOMAIN"
3450
[ -z "${XMPP_HIDDEN_DOMAIN}" ] && XMPP_HIDDEN_DOMAIN=hidden.meet.jitsi
35-
[ -z "$PROSODY_MODE" ] && PROSODY_MODE="client"
3651

3752
PROSODY_CFG="/config/prosody.cfg.lua"
3853

0 commit comments

Comments
 (0)