From 4369907615c37327376d8bc1f3fbc7af046233bd Mon Sep 17 00:00:00 2001 From: Aaron van Meerten Date: Fri, 11 Oct 2024 10:50:41 -0500 Subject: [PATCH] feat(jibri,jicofo,jigasi,jvb,prosody,web): trim empty list entries when splitting with splitList to allow trailing comma (#1932) --- jibri/rootfs/defaults/jibri.conf | 4 +-- jibri/rootfs/defaults/xmpp.conf | 2 +- jicofo/rootfs/defaults/jicofo.conf | 4 +-- .../defaults/sip-communicator.properties | 4 +-- .../defaults/xmpp-sip-communicator.properties | 2 +- jvb/rootfs/defaults/jvb.conf | 6 ++-- .../rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 28 +++++++++---------- .../rootfs/defaults/conf.d/visitors.cfg.lua | 16 +++++------ prosody/rootfs/defaults/prosody.cfg.lua | 12 ++++---- web/rootfs/defaults/settings-config.js | 10 +++---- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/jibri/rootfs/defaults/jibri.conf b/jibri/rootfs/defaults/jibri.conf index c342da0..8f56d44 100644 --- a/jibri/rootfs/defaults/jibri.conf +++ b/jibri/rootfs/defaults/jibri.conf @@ -39,7 +39,7 @@ jibri { } {{ if .Env.JIBRI_WEBHOOK_SUBSCRIBERS -}} webhook { - subscribers = [{{ range $index, $element := splitList "," .Env.JIBRI_WEBHOOK_SUBSCRIBERS }}{{ if gt $index 0}},{{ end }}"{{ $element }}"{{ end }}] + subscribers = [{{ range $index, $element := (splitList "," .Env.JIBRI_WEBHOOK_SUBSCRIBERS | compact) }}{{ if gt $index 0}},{{ end }}"{{ $element }}"{{ end }}] }{{ end }} ffmpeg { resolution = "{{ $JIBRI_RECORDING_RESOLUTION }}" @@ -62,7 +62,7 @@ jibri { chrome { // The flags which will be passed to chromium when launching flags = [ - "{{ join "\",\"" (splitList "," .Env.CHROMIUM_FLAGS) }}" + "{{ join "\",\"" (splitList "," .Env.CHROMIUM_FLAGS | compact) }}" ] } {{ else if $IGNORE_CERTIFICATE_ERRORS -}} diff --git a/jibri/rootfs/defaults/xmpp.conf b/jibri/rootfs/defaults/xmpp.conf index c8e58f3..64ceda9 100644 --- a/jibri/rootfs/defaults/xmpp.conf +++ b/jibri/rootfs/defaults/xmpp.conf @@ -12,7 +12,7 @@ {{ $XMPP_TRUST_ALL_CERTS := .Env.XMPP_TRUST_ALL_CERTS | default "true" | toBool -}} {{ $XMPP_PORT := .Env.XMPP_PORT | default "5222" -}} {{ $XMPP_SERVER := .Env.XMPP_SERVER | default "xmpp.meet.jitsi" -}} -{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER -}} +{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER | compact -}} {{/* assign env from context, preserve during range when . is re-assigned */}} {{ $ENV := .Env -}} diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf index 26bfece..61148cd 100644 --- a/jicofo/rootfs/defaults/jicofo.conf +++ b/jicofo/rootfs/defaults/jicofo.conf @@ -27,7 +27,7 @@ {{ $VISITORS_XMPP_AUTH_DOMAIN := .Env.VISITORS_XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}} {{ $VISITORS_XMPP_DOMAIN := .Env.VISITORS_XMPP_DOMAIN | default "meet.jitsi" -}} {{ $VISITORS_XMPP_SERVER := .Env.VISITORS_XMPP_SERVER | default "" -}} -{{ $VISITORS_XMPP_SERVERS := splitList "," $VISITORS_XMPP_SERVER -}} +{{ $VISITORS_XMPP_SERVERS := splitList "," $VISITORS_XMPP_SERVER | compact -}} {{ $VISITORS_XMPP_PORT := .Env.VISITORS_XMPP_PORT | default 52220 }} {{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}} {{ $XMPP_MUC_DOMAIN := .Env.XMPP_MUC_DOMAIN | default "muc.meet.jitsi" -}} @@ -39,7 +39,7 @@ {{ $MAX_SSRCS_PER_USER := .Env.MAX_SSRCS_PER_USER | default "20" -}} {{ $MAX_SSRC_GROUPS_PER_USER := .Env.MAX_SSRC_GROUPS_PER_USER | default $MAX_SSRCS_PER_USER -}} {{ $TRUSTED_DOMAIN_LIST := .Env.JICOFO_TRUSTED_DOMAINS | default ($ENABLE_RECORDING | ternary $XMPP_RECORDER_DOMAIN "") -}} -{{ $TRUSTED_DOMAINS := splitList "," $TRUSTED_DOMAIN_LIST -}} +{{ $TRUSTED_DOMAINS := splitList "," $TRUSTED_DOMAIN_LIST | compact -}} {{ $ENV := .Env }} jicofo { diff --git a/jigasi/rootfs/defaults/sip-communicator.properties b/jigasi/rootfs/defaults/sip-communicator.properties index 898dcbd..176bacb 100644 --- a/jigasi/rootfs/defaults/sip-communicator.properties +++ b/jigasi/rootfs/defaults/sip-communicator.properties @@ -6,7 +6,7 @@ {{ $PUBLIC_URL_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}} {{ $SHUTDOWN_REST_ENABLED := .Env.SHUTDOWN_REST_ENABLED | default "false" | toBool -}} {{ $TRUSTED_DOMAIN_LIST := .Env.JIGASI_TRUSTED_DOMAINS | default "" -}} -{{ $TRUSTED_DOMAINS := splitList "," $TRUSTED_DOMAIN_LIST -}} +{{ $TRUSTED_DOMAINS := splitList "," $TRUSTED_DOMAIN_LIST | compact -}} net.java.sip.communicator.impl.protocol.SingleCallInProgressPolicy.enabled=false @@ -63,5 +63,5 @@ org.jitsi.jigasi.xmpp.acc.BOSH_URL_PATTERN={{ $BOSH_URL_PATTERN }} {{ end }} {{ if .Env.JIGASI_CONFIGURATION -}} -{{ join "\n" (splitList "," .Env.JIGASI_CONFIGURATION) }} +{{ join "\n" (splitList "," .Env.JIGASI_CONFIGURATION | compact) }} {{ end -}} diff --git a/jigasi/rootfs/defaults/xmpp-sip-communicator.properties b/jigasi/rootfs/defaults/xmpp-sip-communicator.properties index 67d617c..0708518 100644 --- a/jigasi/rootfs/defaults/xmpp-sip-communicator.properties +++ b/jigasi/rootfs/defaults/xmpp-sip-communicator.properties @@ -5,7 +5,7 @@ {{ $XMPP_INTERNAL_MUC_DOMAIN := .Env.XMPP_INTERNAL_MUC_DOMAIN | default "internal-muc.meet.jitsi" -}} {{ $XMPP_PORT := .Env.XMPP_PORT | default "5222" -}} {{ $XMPP_SERVER := .Env.XMPP_SERVER | default "xmpp.meet.jitsi" -}} -{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER -}} +{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER | compact -}} {{/* assign env from context, preserve during range when . is re-assigned */}} {{ $ENV := .Env -}} diff --git a/jvb/rootfs/defaults/jvb.conf b/jvb/rootfs/defaults/jvb.conf index 92561b9..f53bf5f 100644 --- a/jvb/rootfs/defaults/jvb.conf +++ b/jvb/rootfs/defaults/jvb.conf @@ -12,13 +12,13 @@ {{ $JVB_MUC_NICKNAME := .Env.JVB_MUC_NICKNAME | default .Env.HOSTNAME -}} {{ $JVB_ADVERTISE_PRIVATE_CANDIDATES := .Env.JVB_ADVERTISE_PRIVATE_CANDIDATES | default "true" | toBool -}} {{ $JVB_ADVERTISE_IPS := .Env.JVB_ADVERTISE_IPS | default "" -}} -{{ $JVB_IPS := splitList "," $JVB_ADVERTISE_IPS -}} +{{ $JVB_IPS := splitList "," $JVB_ADVERTISE_IPS | compact -}} {{ $JVB_REQUIRE_VALID_ADDRESS := .Env.JVB_REQUIRE_VALID_ADDRESS | default "0" | toBool -}} {{ $JVB_XMPP_AUTH_DOMAIN := .Env.JVB_XMPP_AUTH_DOMAIN | default "auth.jvb.meet.jitsi" -}} {{ $JVB_XMPP_INTERNAL_MUC_DOMAIN := .Env.JVB_XMPP_INTERNAL_MUC_DOMAIN | default "muc.jvb.meet.jitsi" -}} {{ $JVB_XMPP_PORT := .Env.JVB_XMPP_PORT | default "6222" -}} {{ $JVB_XMPP_SERVER := .Env.JVB_XMPP_SERVER | default "xmpp.jvb.meet.jitsi" -}} -{{ $JVB_XMPP_SERVERS := splitList "," $JVB_XMPP_SERVER -}} +{{ $JVB_XMPP_SERVERS := splitList "," $JVB_XMPP_SERVER | compact -}} {{ $PUBLIC_URL_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}} {{ $SHUTDOWN_REST_ENABLED := .Env.SHUTDOWN_REST_ENABLED | default "false" | toBool -}} {{ $USE_USRSCTP := .Env.JVB_USE_USRSCTP | default "false" | toBool -}} @@ -29,7 +29,7 @@ {{ $XMPP_INTERNAL_MUC_DOMAIN := .Env.XMPP_INTERNAL_MUC_DOMAIN | default "internal-muc.meet.jitsi" -}} {{ $XMPP_PORT := .Env.XMPP_PORT | default "5222" -}} {{ $XMPP_SERVER := .Env.XMPP_SERVER | default "xmpp.meet.jitsi" -}} -{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER -}} +{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER | compact -}} {{/* assign env from context, preserve during range when . is re-assigned */}} {{ $ENV := .Env -}} diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua index e03a0fc..2c17f34 100644 --- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua +++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua @@ -44,13 +44,13 @@ {{ $STUN_HOST := .Env.STUN_HOST | default "" -}} {{ $STUN_PORT := .Env.STUN_PORT | default "443" -}} {{ $TURNS_HOST := .Env.TURNS_HOST | default "" -}} -{{ $TURNS_HOSTS := splitList "," $TURNS_HOST -}} +{{ $TURNS_HOSTS := splitList "," $TURNS_HOST | compact -}} {{ $TURNS_PORT := .Env.TURNS_PORT | default "443" -}} {{ $TURN_HOST := .Env.TURN_HOST | default "" -}} -{{ $TURN_HOSTS := splitList "," $TURN_HOST -}} +{{ $TURN_HOSTS := splitList "," $TURN_HOST | compact -}} {{ $TURN_PORT := .Env.TURN_PORT | default "443" -}} {{ $TURN_TRANSPORT := .Env.TURN_TRANSPORT | default "tcp" -}} -{{ $TURN_TRANSPORTS := splitList "," $TURN_TRANSPORT -}} +{{ $TURN_TRANSPORTS := splitList "," $TURN_TRANSPORT | compact -}} {{ $TURN_TTL := .Env.TURN_TTL | default "86400" -}} {{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}} {{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}} @@ -113,11 +113,11 @@ external_services = { {{- end }} {{ if and $ENABLE_AUTH (or (eq $PROSODY_AUTH_TYPE "jwt") (eq $PROSODY_AUTH_TYPE "hybrid_matrix_token")) .Env.JWT_ACCEPTED_ISSUERS }} -asap_accepted_issuers = { "{{ join "\",\"" (splitList "," .Env.JWT_ACCEPTED_ISSUERS) }}" } +asap_accepted_issuers = { "{{ join "\",\"" (splitList "," .Env.JWT_ACCEPTED_ISSUERS | compact) }}" } {{ end }} {{ if and $ENABLE_AUTH (or (eq $PROSODY_AUTH_TYPE "jwt") (eq $PROSODY_AUTH_TYPE "hybrid_matrix_token")) .Env.JWT_ACCEPTED_AUDIENCES }} -asap_accepted_audiences = { "{{ join "\",\"" (splitList "," .Env.JWT_ACCEPTED_AUDIENCES) }}" } +asap_accepted_audiences = { "{{ join "\",\"" (splitList "," .Env.JWT_ACCEPTED_AUDIENCES | compact) }}" } {{ end }} consider_bosh_secure = true; @@ -223,7 +223,7 @@ VirtualHost "{{ $XMPP_DOMAIN }}" "av_moderation"; {{ end }} {{ if .Env.XMPP_MODULES }} - "{{ join "\";\n \"" (splitList "," .Env.XMPP_MODULES) }}"; + "{{ join "\";\n \"" (splitList "," .Env.XMPP_MODULES | compact) }}"; {{ end }} {{ if and $ENABLE_AUTH (eq $PROSODY_AUTH_TYPE "ldap") }} "auth_cyrus"; @@ -275,7 +275,7 @@ VirtualHost "{{ $XMPP_DOMAIN }}" {{ end }} {{ if .Env.XMPP_CONFIGURATION -}} - {{ join "\n " (splitList "," .Env.XMPP_CONFIGURATION) }} + {{ join "\n " (splitList "," .Env.XMPP_CONFIGURATION | compact) }} {{ end -}} {{ if $ENABLE_GUEST_DOMAIN }} @@ -321,7 +321,7 @@ Component "{{ $XMPP_INTERNAL_MUC_DOMAIN }}" "muc" "muc_hide_all"; "muc_filter_access"; {{ if .Env.XMPP_INTERNAL_MUC_MODULES -}} - "{{ join "\";\n\"" (splitList "," .Env.XMPP_INTERNAL_MUC_MODULES) }}"; + "{{ join "\";\n\"" (splitList "," .Env.XMPP_INTERNAL_MUC_MODULES | compact) }}"; {{ end -}} } restrict_room_creation = true @@ -338,7 +338,7 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc" modules_enabled = { "muc_meeting_id"; {{ if .Env.XMPP_MUC_MODULES -}} - "{{ join "\";\n \"" (splitList "," .Env.XMPP_MUC_MODULES) }}"; + "{{ join "\";\n \"" (splitList "," .Env.XMPP_MUC_MODULES | compact) }}"; {{ end -}} {{ if and $ENABLE_AUTH (or (eq $PROSODY_AUTH_TYPE "jwt") (eq $PROSODY_AUTH_TYPE "hybrid_matrix_token")) -}} "{{ $JWT_TOKEN_AUTH_MODULE }}"; @@ -378,7 +378,7 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc" -- List of regular expressions for IP addresses that are not limited by this module. rate_limit_whitelist = { "127.0.0.1"; -{{ range $index, $cidr := (splitList "," $RATE_LIMIT_ALLOW_RANGES) }} +{{ range $index, $cidr := (splitList "," $RATE_LIMIT_ALLOW_RANGES | compact) }} "{{ $cidr }}"; {{ end }} }; @@ -395,7 +395,7 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc" muc_room_locking = false muc_room_default_public_jids = true {{ if .Env.XMPP_MUC_CONFIGURATION -}} - {{ join "\n " (splitList "," .Env.XMPP_MUC_CONFIGURATION) }} + {{ join "\n " (splitList "," .Env.XMPP_MUC_CONFIGURATION | compact) }} {{ end -}} {{ if .Env.MAX_PARTICIPANTS }} muc_access_whitelist = { @@ -428,7 +428,7 @@ Component "speakerstats.{{ $XMPP_DOMAIN }}" "speakerstats_component" muc_component = "{{ $XMPP_MUC_DOMAIN }}" {{- if .Env.XMPP_SPEAKERSTATS_MODULES }} modules_enabled = { - "{{ join "\";\n \"" (splitList "," .Env.XMPP_SPEAKERSTATS_MODULES) }}"; + "{{ join "\";\n \"" (splitList "," .Env.XMPP_SPEAKERSTATS_MODULES | compact) }}"; } {{- end }} @@ -459,7 +459,7 @@ Component "lobby.{{ $XMPP_DOMAIN }}" "muc" "muc_rate_limit"; {{ end -}} {{ if .Env.XMPP_LOBBY_MUC_MODULES -}} - "{{ join "\";\n \"" (splitList "," .Env.XMPP_LOBBY_MUC_MODULES) }}"; + "{{ join "\";\n \"" (splitList "," .Env.XMPP_LOBBY_MUC_MODULES | compact) }}"; {{ end -}} } @@ -483,7 +483,7 @@ Component "breakout.{{ $XMPP_DOMAIN }}" "muc" "muc_rate_limit"; {{ end -}} {{ if .Env.XMPP_BREAKOUT_MUC_MODULES -}} - "{{ join "\";\n \"" (splitList "," .Env.XMPP_BREAKOUT_MUC_MODULES) }}"; + "{{ join "\";\n \"" (splitList "," .Env.XMPP_BREAKOUT_MUC_MODULES | compact) }}"; {{ end -}} } {{ end }} diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua index 3d32a92..17682a6 100644 --- a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua +++ b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua @@ -18,13 +18,13 @@ {{ $SHARD_NAME := .Env.SHARD | default "default" -}} {{ $S2S_PORT := .Env.PROSODY_S2S_PORT | default "5269" -}} {{ $TURN_HOST := .Env.TURN_HOST | default "" -}} -{{ $TURN_HOSTS := splitList "," $TURN_HOST -}} +{{ $TURN_HOSTS := splitList "," $TURN_HOST | compact -}} {{ $TURN_PORT := .Env.TURN_PORT | default "443" -}} {{ $TURN_TRANSPORT := .Env.TURN_TRANSPORT | default "tcp" -}} -{{ $TURN_TRANSPORTS := splitList "," $TURN_TRANSPORT -}} +{{ $TURN_TRANSPORTS := splitList "," $TURN_TRANSPORT | compact -}} {{ $TURN_TTL := .Env.TURN_TTL | default "86400" -}} {{ $TURNS_HOST := .Env.TURNS_HOST | default "" -}} -{{ $TURNS_HOSTS := splitList "," $TURNS_HOST -}} +{{ $TURNS_HOSTS := splitList "," $TURNS_HOST | compact -}} {{ $TURNS_PORT := .Env.TURNS_PORT | default "443" -}} {{ $VISITOR_INDEX := .Env.PROSODY_VISITOR_INDEX | default "0" -}} {{ $VISITORS_MUC_PREFIX := .Env.PROSODY_VISITORS_MUC_PREFIX | default "muc" -}} @@ -124,7 +124,7 @@ VirtualHost 'v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}' "smacks"; -- XEP-0198: Stream Management {{ end -}} {{ if .Env.XMPP_MODULES }} - "{{ join "\";\n\"" (splitList "," .Env.XMPP_MODULES) }}"; + "{{ join "\";\n\"" (splitList "," .Env.XMPP_MODULES | compact) }}"; {{ end }} } main_muc = '{{ $VISITORS_MUC_PREFIX }}.v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}'; @@ -133,7 +133,7 @@ VirtualHost 'v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}' release_number = "{{ $RELEASE_NUMBER }}" {{ if .Env.XMPP_CONFIGURATION -}} - {{ join "\n " (splitList "," .Env.XMPP_CONFIGURATION) }} + {{ join "\n " (splitList "," .Env.XMPP_CONFIGURATION | compact) }} {{- end }} VirtualHost '{{ $XMPP_AUTH_DOMAIN }}' @@ -162,7 +162,7 @@ Component '{{ $VISITORS_MUC_PREFIX }}.v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DO "rate_limit"; {{ end -}} {{ if .Env.XMPP_MUC_MODULES -}} - "{{ join "\";\n\"" (splitList "," .Env.XMPP_MUC_MODULES) }}"; + "{{ join "\";\n\"" (splitList "," .Env.XMPP_MUC_MODULES | compact) }}"; {{ end -}} } muc_room_default_presence_broadcast = { @@ -189,7 +189,7 @@ Component '{{ $VISITORS_MUC_PREFIX }}.v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DO -- List of regular expressions for IP addresses that are not limited by this module. rate_limit_whitelist = { "127.0.0.1"; - {{ range $index, $cidr := (splitList "," $RATE_LIMIT_ALLOW_RANGES) -}} + {{ range $index, $cidr := (splitList "," $RATE_LIMIT_ALLOW_RANGES | compact) -}} "{{ $cidr }}"; {{ end -}} }; @@ -201,5 +201,5 @@ Component '{{ $VISITORS_MUC_PREFIX }}.v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DO muc_rate_joins = 30; {{ if .Env.XMPP_MUC_CONFIGURATION -}} - {{ join "\n" (splitList "," .Env.XMPP_MUC_CONFIGURATION) }} + {{ join "\n" (splitList "," .Env.XMPP_MUC_CONFIGURATION | compact) }} {{ end -}} diff --git a/prosody/rootfs/defaults/prosody.cfg.lua b/prosody/rootfs/defaults/prosody.cfg.lua index 00b8677..37e477f 100644 --- a/prosody/rootfs/defaults/prosody.cfg.lua +++ b/prosody/rootfs/defaults/prosody.cfg.lua @@ -21,16 +21,16 @@ {{ $PROSODY_ENABLE_METRICS := .Env.PROSODY_ENABLE_METRICS | default "false" | toBool -}} {{ $PROSODY_ENABLE_STANZA_COUNTS := .Env.PROSODY_ENABLE_STANZA_COUNTS | default "false" | toBool -}} {{ $PROSODY_ADMINS := .Env.PROSODY_ADMINS | default "" -}} -{{ $PROSODY_ADMIN_LIST := splitList "," $PROSODY_ADMINS -}} +{{ $PROSODY_ADMIN_LIST := splitList "," $PROSODY_ADMINS | compact -}} {{ $PROSODY_MODE := .Env.PROSODY_MODE | default "client" -}} {{ $TRUSTED_PROXIES := .Env.PROSODY_TRUSTED_PROXIES | default "127.0.0.1,::1" -}} -{{ $TRUSTED_PROXY_LIST := splitList "," $TRUSTED_PROXIES -}} +{{ $TRUSTED_PROXY_LIST := splitList "," $TRUSTED_PROXIES | compact -}} {{ $PROSODY_S2S_LIMIT := .Env.PROSODY_S2S_LIMIT | default "30kb/s" -}} {{ $S2S_PORT := .Env.PROSODY_S2S_PORT | default "5269" }} {{ $VISITORS_MUC_PREFIX := .Env.PROSODY_VISITORS_MUC_PREFIX | default "muc" -}} {{ $VISITORS_XMPP_DOMAIN := .Env.VISITORS_XMPP_DOMAIN | default "meet.jitsi" -}} {{ $VISITORS_XMPP_SERVER := .Env.VISITORS_XMPP_SERVER | default "" -}} -{{ $VISITORS_XMPP_SERVERS := splitList "," $VISITORS_XMPP_SERVER -}} +{{ $VISITORS_XMPP_SERVERS := splitList "," $VISITORS_XMPP_SERVER | compact -}} {{ $VISITORS_XMPP_PORT := .Env.VISITORS_XMPP_PORT | default 52220 }} {{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}} {{ $XMPP_GUEST_DOMAIN := .Env.XMPP_GUEST_DOMAIN | default "guest.meet.jitsi" -}} @@ -133,7 +133,7 @@ modules_enabled = { {{ end -}} {{ if .Env.GLOBAL_MODULES }} - "{{ join "\";\n\"" (splitList "," .Env.GLOBAL_MODULES) }}"; + "{{ join "\";\n\"" (splitList "," .Env.GLOBAL_MODULES | compact) }}"; {{ end }} }; @@ -314,7 +314,7 @@ authentication = "internal_hashed" log = { { levels = {min = "{{ $LOG_LEVEL }}"}, timestamps = "%Y-%m-%d %X", to = "console"}; {{ if .Env.PROSODY_LOG_CONFIG }} - {{ join "\n" (splitList "\\n" .Env.PROSODY_LOG_CONFIG) }} + {{ join "\n" (splitList "\\n" .Env.PROSODY_LOG_CONFIG | compact) }} {{ end }} } @@ -326,7 +326,7 @@ openmetrics_allow_cidr = "{{ $PROSODY_METRICS_ALLOWED_CIDR }}" {{ end }} {{ if .Env.GLOBAL_CONFIG }} -{{ join "\n" (splitList "\\n" .Env.GLOBAL_CONFIG) }} +{{ join "\n" (splitList "\\n" .Env.GLOBAL_CONFIG | compact) }} {{ end }} -- Enable use of native prosody 0.11 support for epoll over select diff --git a/web/rootfs/defaults/settings-config.js b/web/rootfs/defaults/settings-config.js index 3a65a84..f440670 100644 --- a/web/rootfs/defaults/settings-config.js +++ b/web/rootfs/defaults/settings-config.js @@ -227,11 +227,11 @@ config.analytics.matomoSiteID = '{{ .Env.MATOMO_SITE_ID }}'; {{ if .Env.ANALYTICS_SCRIPT_URLS -}} // Array of script URLs to load as lib-jitsi-meet "analytics handlers". -config.analytics.scriptURLs = [ '{{ join "','" (splitList "," .Env.ANALYTICS_SCRIPT_URLS) }}' ]; +config.analytics.scriptURLs = [ '{{ join "','" (splitList "," .Env.ANALYTICS_SCRIPT_URLS | compact) }}' ]; {{ end -}} {{ if .Env.ANALYTICS_WHITELISTED_EVENTS -}} -config.analytics.whiteListedEvents = [ '{{ join "','" (splitList "," .Env.ANALYTICS_WHITELISTED_EVENTS) }}' ]; +config.analytics.whiteListedEvents = [ '{{ join "','" (splitList "," .Env.ANALYTICS_WHITELISTED_EVENTS | compact) }}' ]; {{ end -}} @@ -299,7 +299,7 @@ config.prejoinConfig = { // List of buttons to hide from the extra join options dropdown on prejoin screen. {{ if .Env.HIDE_PREJOIN_EXTRA_BUTTONS -}} -config.prejoinConfig.hideExtraJoinButtons = [ '{{ join "','" (splitList "," .Env.HIDE_PREJOIN_EXTRA_BUTTONS) }}' ]; +config.prejoinConfig.hideExtraJoinButtons = [ '{{ join "','" (splitList "," .Env.HIDE_PREJOIN_EXTRA_BUTTONS | compact) }}' ]; {{ end -}} // Welcome page. @@ -522,12 +522,12 @@ config.disablePolls = {{ $DISABLE_POLLS }}; // Configure toolbar buttons {{ if .Env.TOOLBAR_BUTTONS -}} -config.toolbarButtons = [ '{{ join "','" (splitList "," .Env.TOOLBAR_BUTTONS) }}' ]; +config.toolbarButtons = [ '{{ join "','" (splitList "," .Env.TOOLBAR_BUTTONS | compact) }}' ]; {{ end -}} // Hides the buttons at pre-join screen {{ if .Env.HIDE_PREMEETING_BUTTONS -}} -config.hiddenPremeetingButtons = [ '{{ join "','" (splitList "," .Env.HIDE_PREMEETING_BUTTONS) }}' ]; +config.hiddenPremeetingButtons = [ '{{ join "','" (splitList "," .Env.HIDE_PREMEETING_BUTTONS | compact) }}' ]; {{ end -}} // Configure remote participant video menu