From 9fbb5bd815e098d1ef15b99faec9372bd7cd3fea Mon Sep 17 00:00:00 2001
From: bgrozev <boris@jitsi.org>
Date: Mon, 31 Oct 2022 13:08:18 -0500
Subject: [PATCH] jicofo: fix XMPP config (all moved to jicofo.conf)

---
 jicofo/rootfs/defaults/jicofo.conf      | 1 +
 jicofo/rootfs/etc/services.d/jicofo/run | 9 +--------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf
index 1e0119f8..226ec8f6 100644
--- a/jicofo/rootfs/defaults/jicofo.conf
+++ b/jicofo/rootfs/defaults/jicofo.conf
@@ -144,6 +144,7 @@ jicofo {
         hostname = "{{ $XMPP_SERVER }}"
         port = "{{ $XMPP_PORT }}"
         domain = "{{ $XMPP_AUTH_DOMAIN }}"
+        xmpp-domain = "{{ $XMPP_DOMAIN }}"
         username = "{{ $JICOFO_AUTH_USER }}"
         password = "{{ .Env.JICOFO_AUTH_PASSWORD }}"
         conference-muc-jid = "{{ $XMPP_MUC_DOMAIN }}"
diff --git a/jicofo/rootfs/etc/services.d/jicofo/run b/jicofo/rootfs/etc/services.d/jicofo/run
index f9a1b9af..8e8b315b 100644
--- a/jicofo/rootfs/etc/services.d/jicofo/run
+++ b/jicofo/rootfs/etc/services.d/jicofo/run
@@ -1,14 +1,7 @@
 #!/usr/bin/with-contenv bash
 
-# Defaults
-[ -z "${JICOFO_AUTH_USER}" ] && export JICOFO_AUTH_USER=focus
-[ -z "${XMPP_AUTH_DOMAIN}" ] && export XMPP_AUTH_DOMAIN=auth.meet.jitsi
-[ -z "${XMPP_DOMAIN}" ] && export XMPP_DOMAIN=meet.jitsi
-[ -z "${XMPP_SERVER}" ] && export XMPP_SERVER=xmpp.meet.jitsi
-
 JAVA_SYS_PROPS="-Djava.util.logging.config.file=/config/logging.properties -Dconfig.file=/config/jicofo.conf"
 DAEMON=/usr/share/jicofo/jicofo.sh
 DAEMON_DIR=/usr/share/jicofo/
-DAEMON_OPTS="--domain=\"$XMPP_DOMAIN\" --host=\"$XMPP_SERVER\" --user_name=\"$JICOFO_AUTH_USER\" --user_domain=\"$XMPP_AUTH_DOMAIN\" --user_password=\"$JICOFO_AUTH_PASSWORD\""
 
-exec s6-setuidgid jicofo /bin/bash -c "cd $DAEMON_DIR; JAVA_SYS_PROPS=\"$JAVA_SYS_PROPS\" exec $DAEMON $DAEMON_OPTS"
+exec s6-setuidgid jicofo /bin/bash -c "cd $DAEMON_DIR; JAVA_SYS_PROPS=\"$JAVA_SYS_PROPS\" exec $DAEMON"