Преглед на файлове

prosody: var for config in main vhost (#1615)

Aaron van Meerten преди 1 година
родител
ревизия
5120595a48
променени са 3 файла, в които са добавени 10 реда и са изтрити 1 реда
  1. 1 0
      docker-compose.yml
  2. 5 1
      prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
  3. 4 0
      prosody/rootfs/defaults/conf.d/visitors.cfg.lua

+ 1 - 0
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

+ 5 - 1
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"

+ 4 - 0
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 = {