From d9b84cfc2ab8a6614b681b37ec79bd56da5da306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Fri, 14 May 2021 11:21:40 +0200
Subject: [PATCH] jibri: set base URL for joining meetings

This will make Jibri join PUBLIC_URL/meetingName instead of https://meet.jitsi/meetingName.
---
 docker-compose.yml                | 2 --
 jibri.yml                         | 1 +
 jibri/rootfs/defaults/config.json | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 66a4df0d..1c229b3c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -108,8 +108,6 @@ services:
             - TOKEN_AUTH_URL
         networks:
             meet.jitsi:
-                aliases:
-                    - ${XMPP_DOMAIN}
 
     # XMPP server
     prosody:
diff --git a/jibri.yml b/jibri.yml
index 67b5b980..1cd00314 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -13,6 +13,7 @@ services:
         devices:
             - /dev/snd:/dev/snd
         environment:
+            - PUBLIC_URL
             - XMPP_AUTH_DOMAIN
             - XMPP_INTERNAL_MUC_DOMAIN
             - XMPP_RECORDER_DOMAIN
diff --git a/jibri/rootfs/defaults/config.json b/jibri/rootfs/defaults/config.json
index 9b55432c..d6e1c913 100644
--- a/jibri/rootfs/defaults/config.json
+++ b/jibri/rootfs/defaults/config.json
@@ -15,6 +15,8 @@
                 "{{ .Env.XMPP_SERVER }}"
             ],
             "xmpp_domain": "{{ .Env.XMPP_DOMAIN }}",
+            // An (optional) base url the Jibri will join if it is set
+            "baseUrl": "{{ .Env.PUBLIC_URL }}",
             // Jibri will login to the xmpp server as a privileged user 
             "control_login": {
                 "domain": "{{ .Env.XMPP_AUTH_DOMAIN }}",
@@ -28,7 +30,7 @@
             "control_muc": {
                 "domain": "{{ .Env.XMPP_INTERNAL_MUC_DOMAIN }}",
                 "room_name": "{{ .Env.JIBRI_BREWERY_MUC }}",
-		// MUST be unic for every instanse
+                // MUST be unic for every instanse
                 "nickname": "jibri-instanse-{{ .Env.JIBRI_INSTANCE_ID }}"
             },
             // All participants in a call join a muc so they can exchange