From 84332c95277f5477f31a9ca8b5dd5bce209eefb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Thu, 26 Apr 2018 08:38:59 +0200
Subject: [PATCH] xmpp: add ability to customize the jicofo auth user

---
 docker-compose.yml                                | 2 ++
 prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 2 +-
 prosody/rootfs/etc/cont-init.d/10-config          | 1 +
 web/rootfs/etc/cont-init.d/10-config              | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a555a57..ca4c1c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,9 @@ services:
         volumes:
             - ${CONFIG}/meet:/config
         environment:
+            - JICOFO_AUTH_USER
             - XMPP_DOMAIN
+            - XMPP_AUTH_DOMAIN
             - XMPP_BOSH_URL_BASE=http://xmpp.meet.jitsi:5280
             - TZ
         networks:
diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index 4f09304..8604cd0 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/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}"
         authentication = "anonymous"
diff --git a/prosody/rootfs/etc/cont-init.d/10-config b/prosody/rootfs/etc/cont-init.d/10-config
index bdcb627..07e5524 100644
--- a/prosody/rootfs/etc/cont-init.d/10-config
+++ b/prosody/rootfs/etc/cont-init.d/10-config
@@ -12,6 +12,7 @@ if [[ ! -f $PROSODY_CFG ]]; then
     sed -i \
         -e "s,\${XMPP_DOMAIN},$XMPP_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,\${JVB_COMPONENT_SECRET},$JVB_COMPONENT_SECRET,g" \
         /config/conf.d/jitsi-meet.cfg.lua
diff --git a/web/rootfs/etc/cont-init.d/10-config b/web/rootfs/etc/cont-init.d/10-config
index 06b102e..744e7dd 100644
--- a/web/rootfs/etc/cont-init.d/10-config
+++ b/web/rootfs/etc/cont-init.d/10-config
@@ -25,5 +25,6 @@ if [[ ! -f /config/config.js ]]; then
     sed -i \
         -e "s#jitsi-meet.example.com#$XMPP_DOMAIN#g" \
         -e "s#bosh:.*#bosh: '/http-bind',#" \
+        -e "s#// focusUserJid:.*#focusUserJid: '${JICOFO_AUTH_USER}@${XMPP_AUTH_DOMAIN}',#" \
         /config/config.js
 fi