Skip to content

Commit 3a4db54

Browse files
authored
web: add config options for polls and reactions
1 parent 4d22c16 commit 3a4db54

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

docker-compose.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ services:
4444
- DIALIN_NUMBERS_URL
4545
- DIALOUT_AUTH_URL
4646
- DIALOUT_CODES_URL
47+
- DISABLE_POLLS
4748
- DROPBOX_APPKEY
4849
- DROPBOX_REDIRECT_URI
4950
- DYNAMIC_BRANDING_URL
@@ -56,6 +57,7 @@ services:
5657
- ENABLE_IPV6
5758
- ENABLE_LIPSYNC
5859
- ENABLE_NO_AUDIO_DETECTION
60+
- ENABLE_REACTIONS
5961
- ENABLE_P2P
6062
- ENABLE_PREJOIN_PAGE
6163
- ENABLE_WELCOME_PAGE
@@ -135,6 +137,7 @@ services:
135137
- ${CONFIG}/prosody/prosody-plugins-custom:/prosody-plugins-custom:Z
136138
environment:
137139
- AUTH_TYPE
140+
- DISABLE_POLLS
138141
- ENABLE_AUTH
139142
- ENABLE_GUESTS
140143
- ENABLE_LOBBY

prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
{{ $TURN_PORT := .Env.TURN_PORT | default "443" }}
1313
{{ $TURNS_PORT := .Env.TURNS_PORT | default "443" }}
1414
{{ $XMPP_MUC_DOMAIN_PREFIX := (split "." .Env.XMPP_MUC_DOMAIN)._0 }}
15+
{{ $DISABLE_POLLS := .Env.DISABLE_POLLS | default "false" | toBool -}}
1516

1617
admins = {
1718
"{{ .Env.JICOFO_AUTH_USER }}@{{ .Env.XMPP_AUTH_DOMAIN }}",
@@ -187,9 +188,9 @@ Component "{{ .Env.XMPP_INTERNAL_MUC_DOMAIN }}" "muc"
187188
storage = "memory"
188189
modules_enabled = {
189190
"ping";
190-
{{ if .Env.XMPP_INTERNAL_MUC_MODULES }}
191+
{{ if .Env.XMPP_INTERNAL_MUC_MODULES -}}
191192
"{{ join "\";\n\"" (splitList "," .Env.XMPP_INTERNAL_MUC_MODULES) }}";
192-
{{ end }}
193+
{{ end -}}
193194
}
194195
restrict_room_creation = true
195196
muc_room_locking = false
@@ -199,12 +200,15 @@ Component "{{ .Env.XMPP_MUC_DOMAIN }}" "muc"
199200
storage = "memory"
200201
modules_enabled = {
201202
"muc_meeting_id";
202-
{{ if .Env.XMPP_MUC_MODULES }}
203+
{{ if .Env.XMPP_MUC_MODULES -}}
203204
"{{ join "\";\n\"" (splitList "," .Env.XMPP_MUC_MODULES) }}";
204-
{{ end }}
205-
{{ if and $ENABLE_AUTH (eq $AUTH_TYPE "jwt") }}
205+
{{ end -}}
206+
{{ if and $ENABLE_AUTH (eq $AUTH_TYPE "jwt") -}}
206207
"{{ $JWT_TOKEN_AUTH_MODULE }}";
207-
{{ end }}
208+
{{ end -}}
209+
{{ if not $DISABLE_POLLS -}}
210+
"polls";
211+
{{ end -}}
208212
}
209213
muc_room_cache_size = 1000
210214
muc_room_locking = false

web/rootfs/defaults/settings-config.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
{{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN -}}
4040
{{ $DISABLE_DEEP_LINKING := .Env.DISABLE_DEEP_LINKING | default "false" | toBool -}}
4141
{{ $VIDEOQUALITY_ENFORCE_PREFERRED_CODEC := .Env.VIDEOQUALITY_ENFORCE_PREFERRED_CODEC | default "false" | toBool -}}
42+
{{ $DISABLE_POLLS := .Env.DISABLE_POLLS | default "false" | toBool -}}
43+
{{ $ENABLE_REACTIONS := .Env.ENABLE_REACTIONS | default "true" | toBool -}}
4244
// Video configuration.
4345
//
4446

@@ -347,3 +349,9 @@ config.videoQuality.maxBitratesVideo.VP8 = { low: {{ .Env.VIDEOQUALITY_BITRATE_V
347349
{{ if and .Env.VIDEOQUALITY_BITRATE_VP9_LOW .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD .Env.VIDEOQUALITY_BITRATE_VP9_HIGH -}}
348350
config.videoQuality.maxBitratesVideo.VP9 = { low: {{ .Env.VIDEOQUALITY_BITRATE_VP9_LOW }}, standard: {{ .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD }}, high: {{ .Env.VIDEOQUALITY_BITRATE_VP9_HIGH }} };
349351
{{ end -}}
352+
353+
// Enables reactions feature.
354+
config.enableReactions = {{ $ENABLE_REACTIONS }};
355+
356+
// Polls
357+
config.disablePolls = {{ $DISABLE_POLLS }};

0 commit comments

Comments
 (0)