Browse Source

xmpp: add ability to customize the jicofo auth user

Saúl Ibarra Corretgé 7 years ago
parent
commit
84332c9527

+ 2 - 0
docker-compose.yml

@@ -10,7 +10,9 @@ services:
         volumes:
         volumes:
             - ${CONFIG}/meet:/config
             - ${CONFIG}/meet:/config
         environment:
         environment:
+            - JICOFO_AUTH_USER
             - XMPP_DOMAIN
             - XMPP_DOMAIN
+            - XMPP_AUTH_DOMAIN
             - XMPP_BOSH_URL_BASE=http://xmpp.meet.jitsi:5280
             - XMPP_BOSH_URL_BASE=http://xmpp.meet.jitsi:5280
             - TZ
             - TZ
         networks:
         networks:

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

@@ -1,4 +1,4 @@
-admins = { "focus@${XMPP_AUTH_DOMAIN}" }
+admins = { "${JICOFO_AUTH_USER}@${XMPP_AUTH_DOMAIN}" }
 
 
 VirtualHost "${XMPP_DOMAIN}"
 VirtualHost "${XMPP_DOMAIN}"
         authentication = "anonymous"
         authentication = "anonymous"

+ 1 - 0
prosody/rootfs/etc/cont-init.d/10-config

@@ -12,6 +12,7 @@ if [[ ! -f $PROSODY_CFG ]]; then
     sed -i \
     sed -i \
         -e "s,\${XMPP_DOMAIN},$XMPP_DOMAIN,g" \
         -e "s,\${XMPP_DOMAIN},$XMPP_DOMAIN,g" \
         -e "s,\${XMPP_AUTH_DOMAIN},$XMPP_AUTH_DOMAIN,g" \
         -e "s,\${XMPP_AUTH_DOMAIN},$XMPP_AUTH_DOMAIN,g" \
+        -e "s,\${JICOFO_AUTH_USER},$JICOFO_AUTH_USER,g" \
         -e "s,\${JICOFO_COMPONENT_SECRET},$JICOFO_COMPONENT_SECRET,g" \
         -e "s,\${JICOFO_COMPONENT_SECRET},$JICOFO_COMPONENT_SECRET,g" \
         -e "s,\${JVB_COMPONENT_SECRET},$JVB_COMPONENT_SECRET,g" \
         -e "s,\${JVB_COMPONENT_SECRET},$JVB_COMPONENT_SECRET,g" \
         /config/conf.d/jitsi-meet.cfg.lua
         /config/conf.d/jitsi-meet.cfg.lua

+ 1 - 0
web/rootfs/etc/cont-init.d/10-config

@@ -25,5 +25,6 @@ if [[ ! -f /config/config.js ]]; then
     sed -i \
     sed -i \
         -e "s#jitsi-meet.example.com#$XMPP_DOMAIN#g" \
         -e "s#jitsi-meet.example.com#$XMPP_DOMAIN#g" \
         -e "s#bosh:.*#bosh: '/http-bind',#" \
         -e "s#bosh:.*#bosh: '/http-bind',#" \
+        -e "s#// focusUserJid:.*#focusUserJid: '${JICOFO_AUTH_USER}@${XMPP_AUTH_DOMAIN}',#" \
         /config/config.js
         /config/config.js
 fi
 fi