From 3e04fb4fc2955c5adfcba39b9d05e0e2d70b1a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Tue, 2 Feb 2021 10:05:32 +0100
Subject: [PATCH] prosody: fix lobby when authentication is enabled

---
 .../rootfs/defaults/conf.d/jitsi-meet.cfg.lua   | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index 6934a9a..1a1df5b 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -86,7 +86,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
         "ping";
         "speakerstats";
         "conference_duration";
-        {{ if and $ENABLE_LOBBY (not $ENABLE_GUEST_DOMAIN) }}
+        {{ if $ENABLE_LOBBY }}
         "muc_lobby_rooms";
         {{ end }}
         {{ if .Env.XMPP_MODULES }}
@@ -97,7 +97,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
         {{end}}
     }
 
-    {{ if and $ENABLE_LOBBY (not $ENABLE_GUEST_DOMAIN) }}
+    {{ if $ENABLE_LOBBY }}
     main_muc = "{{ .Env.XMPP_MUC_DOMAIN }}"
     lobby_muc = "lobby.{{ .Env.XMPP_DOMAIN }}"
     {{ if .Env.XMPP_RECORDER_DOMAIN }}
@@ -123,19 +123,6 @@ VirtualHost "{{ .Env.XMPP_GUEST_DOMAIN }}"
     allow_empty_token = true
 
     c2s_require_encryption = false
-
-    {{ if $ENABLE_LOBBY }}
-    modules_enabled = {
-        "muc_lobby_rooms";
-    }
-
-    main_muc = "{{ .Env.XMPP_MUC_DOMAIN }}"
-    lobby_muc = "lobby.{{ .Env.XMPP_DOMAIN }}"
-    {{ if .Env.XMPP_RECORDER_DOMAIN }}
-    muc_lobby_whitelist = { "{{ .Env.XMPP_RECORDER_DOMAIN }}" }
-    {{ end }}
-    {{ end }}
-
 {{ end }}
 
 VirtualHost "{{ .Env.XMPP_AUTH_DOMAIN }}"