From aeced375fa7ef05e4a14e6bd30402a1a7e1915c1 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 2 Sep 2022 17:28:56 +0000
Subject: [PATCH] Move our jitsi-meet interface config to defaults

It appears upstream container init now copies this from defaults,
overwriting our modifications. Shadow the one in the container with
ours so it gets copied into the eventual destination.

Also switch back to the old muting variables we were using before,
since the new "with" bools seem not to work (still worth looking
into later).

Change-Id: I7e91e82e6f91b44c5c7eb1406ba0c64d30e6b8ff
---
 .../files/jitsi-meet-docker/meet-docker-compose.yaml         | 5 +++--
 playbooks/roles/jitsi-meet/tasks/main.yaml                   | 2 +-
 playbooks/roles/jitsi-meet/templates/meet-env.j2             | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml b/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml
index 539a9b669d..ad2f4e2088 100644
--- a/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml
+++ b/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml
@@ -12,6 +12,7 @@ services:
         volumes:
             - ${CONFIG}/web:/config
             - ${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/settings-config.js:/defaults/settings-config.js
         environment:
@@ -42,8 +43,8 @@ services:
             - JIBRI_RECORDER_USER
             - JIBRI_RECORDER_PASSWORD
             - ENABLE_RECORDING
-            - START_WITH_AUDIO_MUTED
-            - START_WITH_VIDEO_MUTED
+            - START_AUDIO_MUTED
+            - START_VIDEO_MUTED
 
     # XMPP server
     prosody:
diff --git a/playbooks/roles/jitsi-meet/tasks/main.yaml b/playbooks/roles/jitsi-meet/tasks/main.yaml
index 5363e9b49e..33529489d0 100644
--- a/playbooks/roles/jitsi-meet/tasks/main.yaml
+++ b/playbooks/roles/jitsi-meet/tasks/main.yaml
@@ -45,7 +45,7 @@
 - name: Write interface config
   copy:
     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
   shell:
diff --git a/playbooks/roles/jitsi-meet/templates/meet-env.j2 b/playbooks/roles/jitsi-meet/templates/meet-env.j2
index 5e59f15c8c..27d4c68819 100644
--- a/playbooks/roles/jitsi-meet/templates/meet-env.j2
+++ b/playbooks/roles/jitsi-meet/templates/meet-env.j2
@@ -24,8 +24,8 @@ XMPP_RECORDER_DOMAIN=recorder.localhost
 JIBRI_RECORDER_PASSWORD={{ meetpad_jibri_recorder_password }}
 JIBRI_XMPP_PASSWORD={{ meetpad_jibri_xmpp_password }}
 ENABLE_HTTP_REDIRECT=1
-START_WITH_AUDIO_MUTED=true
-START_WITH_VIDEO_MUTED=true
+START_AUDIO_MUTED=0
+START_VIDEO_MUTED=0
 ENABLE_P2P=false
 
 # shellcheck disable=SC2034