From 5120595a487f91a03d1911067c1308eae643efdf Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <aaron.van.meerten@gmail.com>
Date: Mon, 2 Oct 2023 11:21:32 -0500
Subject: [PATCH] prosody: var for config in main vhost (#1615)

---
 docker-compose.yml                                | 1 +
 prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 6 +++++-
 prosody/rootfs/defaults/conf.d/visitors.cfg.lua   | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f56e52c..cab05d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -262,6 +262,7 @@ services:
             - VISITORS_XMPP_DOMAIN
             - VISITORS_XMPP_SERVER
             - VISITORS_XMPP_PORT
+            - XMPP_CONFIGURATION
             - XMPP_DOMAIN
             - XMPP_AUTH_DOMAIN
             - XMPP_GUEST_DOMAIN
diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index af44b0b..eb704d9 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -244,10 +244,14 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
 
     c2s_require_encryption = false
 
-    {{ if $ENABLE_VISITORS }}
+    {{ if $ENABLE_VISITORS -}}
     visitors_ignore_list = { "{{ $XMPP_RECORDER_DOMAIN }}" }
     {{ end }}
 
+    {{ if .Env.XMPP_CONFIGURATION -}}
+    {{ join "\n    " (splitList "," .Env.XMPP_CONFIGURATION) }}
+    {{ end -}}
+
 {{ if $ENABLE_GUEST_DOMAIN }}
 VirtualHost "{{ $XMPP_GUEST_DOMAIN }}"
     authentication = "jitsi-anonymous"
diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
index 142974b..4f6fe03 100644
--- a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -135,6 +135,10 @@ VirtualHost 'v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}'
     region_name = "{{ $REGION_NAME }}"
     release_number = "{{ $RELEASE_NUMBER }}"
 
+    {{ if .Env.XMPP_CONFIGURATION -}}
+    {{ join "\n    " (splitList "," .Env.XMPP_CONFIGURATION) }}
+    {{ end -}}
+
 
 VirtualHost '{{ $XMPP_AUTH_DOMAIN}}'
     modules_enabled = {