From e219bcfc21a3d00a0b79147a4955f17b640e5aaa Mon Sep 17 00:00:00 2001 From: Debendra Oli Date: Mon, 19 Dec 2022 17:39:51 +0545 Subject: [PATCH] web: add ability to configure whiteboard --- docker-compose.yml | 2 ++ prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 1 + web/rootfs/defaults/settings-config.js | 8 +++++++- web/rootfs/defaults/system-config.js | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 00ccdac..74c7271 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -150,6 +150,8 @@ services: - XMPP_MUC_DOMAIN - XMPP_RECORDER_DOMAIN - XMPP_PORT + - WHITEBOARD_ENABLED + - WHITEBOARD_COLLAB_SERVER_BASE_URL networks: meet.jitsi: diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua index c0e7a18..fe3c39b 100644 --- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua +++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua @@ -156,6 +156,7 @@ VirtualHost "{{ $XMPP_DOMAIN }}" "ping"; "speakerstats"; "conference_duration"; + "room_metadata"; {{ if $ENABLE_END_CONFERENCE }} "end_conference"; {{ end }} diff --git a/web/rootfs/defaults/settings-config.js b/web/rootfs/defaults/settings-config.js index f7d6b03..62d3dfb 100644 --- a/web/rootfs/defaults/settings-config.js +++ b/web/rootfs/defaults/settings-config.js @@ -63,7 +63,8 @@ {{ $ENABLE_LOCAL_RECORDING_SELF_START := .Env.ENABLE_LOCAL_RECORDING_SELF_START | default "false" | toBool -}} {{ $DISABLE_PROFILE := .Env.DISABLE_PROFILE | default "false" | toBool -}} {{ $ROOM_PASSWORD_DIGITS := .Env.ROOM_PASSWORD_DIGITS | default "false" -}} - +{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL := .Env.WHITEBOARD_COLLAB_SERVER_PUBLIC_URL | default "" -}} +{{ $WHITEBOARD_ENABLED := .Env.WHITEBOARD_ENABLED | default "false" | toBool -}} // Video configuration. // @@ -463,3 +464,8 @@ config.e2eping.maxConferenceSize = {{ .Env.E2EPING_MAX_CONFERENCE_SIZE }}; {{ if .Env.E2EPING_MAX_MESSAGE_PER_SECOND -}} config.e2eping.maxMessagePerSecond = {{ .Env.E2EPING_MAX_MESSAGE_PER_SECOND }}; {{ end }} + +// Settings for the Excalidraw whiteboard integration. +if (!config.hasOwnProperty('whiteboard')) config.whiteboard = {}; +config.whiteboard.enabled = {{ $WHITEBOARD_ENABLED }}; +config.whiteboard.collabServerBaseUrl = '{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL }}'; \ No newline at end of file diff --git a/web/rootfs/defaults/system-config.js b/web/rootfs/defaults/system-config.js index a1a4ff6..d907b88 100644 --- a/web/rootfs/defaults/system-config.js +++ b/web/rootfs/defaults/system-config.js @@ -26,7 +26,7 @@ if (subdir.startsWith('