opendev/system-config
Code Issues Proposed changes

Merge "Move our jitsi-meet interface config to defaults"

Browse Source
This commit is contained in:
Zuul 2022-09-02 19:16:54 +00:00 committed by Gerrit Code Review
commit 2e441e771f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml
View File

@ -12,6 +12,7 @@ services:
volumes: volumes:
- ${CONFIG}/web:/config - ${CONFIG}/web:/config
- ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts - ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts
- ${DEFAULTS}/web/interface_config.js:/defaults/interface_config.js
- ${DEFAULTS}/web/nginx/meet.conf:/defaults/meet.conf - ${DEFAULTS}/web/nginx/meet.conf:/defaults/meet.conf
- ${DEFAULTS}/web/settings-config.js:/defaults/settings-config.js - ${DEFAULTS}/web/settings-config.js:/defaults/settings-config.js
environment: environment:
@ -42,8 +43,8 @@ services:
- JIBRI_RECORDER_USER - JIBRI_RECORDER_USER
- JIBRI_RECORDER_PASSWORD - JIBRI_RECORDER_PASSWORD
- ENABLE_RECORDING - ENABLE_RECORDING
- START_WITH_AUDIO_MUTED - START_AUDIO_MUTED
- START_WITH_VIDEO_MUTED - START_VIDEO_MUTED
# XMPP server # XMPP server
prosody: prosody:

2
playbooks/roles/jitsi-meet/tasks/main.yaml
View File

@ -45,7 +45,7 @@
- name: Write interface config - name: Write interface config
copy: copy:
src: interface_config.js src: interface_config.js
dest: /var/jitsi-meet/web/interface_config.js dest: /var/jitsi-meet/defaults/web/interface_config.js
- name: Run docker-compose pull - name: Run docker-compose pull
shell: shell:

4
playbooks/roles/jitsi-meet/templates/meet-env.j2
View File

@ -24,8 +24,8 @@ XMPP_RECORDER_DOMAIN=recorder.localhost
JIBRI_RECORDER_PASSWORD={{ meetpad_jibri_recorder_password }} JIBRI_RECORDER_PASSWORD={{ meetpad_jibri_recorder_password }}
JIBRI_XMPP_PASSWORD={{ meetpad_jibri_xmpp_password }} JIBRI_XMPP_PASSWORD={{ meetpad_jibri_xmpp_password }}
ENABLE_HTTP_REDIRECT=1 ENABLE_HTTP_REDIRECT=1
START_WITH_AUDIO_MUTED=true START_AUDIO_MUTED=0
START_WITH_VIDEO_MUTED=true START_VIDEO_MUTED=0
ENABLE_P2P=false ENABLE_P2P=false
# shellcheck disable=SC2034 # shellcheck disable=SC2034