Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

prosody: s2s whitelist duplicate param fix (#1625)

Browse Source
This commit is contained in:
Aaron van Meerten
2023-10-13 14:52:28 -05:00
committed by GitHub
parent eb91893895
commit af50ddeecb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
prosody/rootfs/defaults/prosody.cfg.lua
View File

@@ -179,6 +179,7 @@ c2s_interfaces = { "*" }
-- set s2s port -- set s2s port
s2s_ports = { {{ $S2S_PORT }} } -- Listen on specific s2s port s2s_ports = { {{ $S2S_PORT }} } -- Listen on specific s2s port
{{ if eq .Env.PROSODY_MODE "visitors" -}}
s2s_whitelist = { s2s_whitelist = {
{{ if $ENABLE_VISITORS -}} {{ if $ENABLE_VISITORS -}}
'{{ $XMPP_MUC_DOMAIN }}'; -- needed for visitors to send messages to main room '{{ $XMPP_MUC_DOMAIN }}'; -- needed for visitors to send messages to main room
@@ -192,6 +193,8 @@ s2s_whitelist = {
} }
{{ end -}} {{ end -}}
{{ end -}}
{{ if $ENABLE_VISITORS -}} {{ if $ENABLE_VISITORS -}}
{{ if $.Env.VISITORS_XMPP_SERVER -}} {{ if $.Env.VISITORS_XMPP_SERVER -}}
s2sout_override = { s2sout_override = {
@@ -202,6 +205,7 @@ s2sout_override = {
["v{{ $index }}.{{ $VISITORS_XMPP_DOMAIN }}"] = "tcp://{{ $SERVER._0 }}:{{ $SERVER._1 | default $DEFAULT_PORT }}"; ["v{{ $index }}.{{ $VISITORS_XMPP_DOMAIN }}"] = "tcp://{{ $SERVER._0 }}:{{ $SERVER._1 | default $DEFAULT_PORT }}";
{{ end -}} {{ end -}}
}; };
{{ if ne .Env.PROSODY_MODE "visitors" -}}
s2s_whitelist = { s2s_whitelist = {
{{ range $index, $element := $VISITORS_XMPP_SERVERS -}} {{ range $index, $element := $VISITORS_XMPP_SERVERS -}}
"{{ $VISITORS_MUC_PREFIX }}.v{{ $index }}.{{ $VISITORS_XMPP_DOMAIN }}"; "{{ $VISITORS_MUC_PREFIX }}.v{{ $index }}.{{ $VISITORS_XMPP_DOMAIN }}";
@@ -209,6 +213,7 @@ s2s_whitelist = {
}; };
{{ end -}} {{ end -}}
{{ end -}} {{ end -}}
{{ end -}}
-- Force certificate authentication for server-to-server connections? -- Force certificate authentication for server-to-server connections?