From 51b656e937aa469e8f09a43bd51dbdabdd4eea1f Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Sun, 22 Mar 2020 18:14:16 +0100
Subject: [PATCH] jicofo seems to work

---
 docker/jitsi/02_run.yml                        | 2 ++
 docker/jitsi/jitsi-conference-focus/Dockerfile | 2 +-
 docker/jitsi/jitsi-conference-focus/jicofo     | 3 +++
 docker/jitsi/jitsi-xmpp/xmpp_run               | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml
index f2ec9e9..ccf1878 100644
--- a/docker/jitsi/02_run.yml
+++ b/docker/jitsi/02_run.yml
@@ -7,6 +7,7 @@ services:
       - "5347:5347"
       - "5280:5280"
     env_file: [ 'dev.env' ]
+    volumes: [ './jitsi-certs/:/certs:ro' ]
   jitsi-front:
     build: ./jitsi-front
     ports:
@@ -15,3 +16,4 @@ services:
   jitsi-conference-focus:
     build: ./jitsi-conference-focus
     env_file: [ 'dev.env' ]
+    volumes: [ './jitsi-certs/:/certs:ro' ]
diff --git a/docker/jitsi/jitsi-conference-focus/Dockerfile b/docker/jitsi/jitsi-conference-focus/Dockerfile
index 7933ed9..190010e 100644
--- a/docker/jitsi/jitsi-conference-focus/Dockerfile
+++ b/docker/jitsi/jitsi-conference-focus/Dockerfile
@@ -14,7 +14,7 @@ RUN cd jicofo && \
 FROM debian:buster
 
 RUN apt-get update && \
-    apt-get install -y openjdk-11-jdk
+    apt-get install -y openjdk-11-jdk ca-certificates
 
 COPY --from=builder /srv/jicofo /srv/jicofo
 COPY jicofo /usr/local/bin/jicofo
diff --git a/docker/jitsi/jitsi-conference-focus/jicofo b/docker/jitsi/jitsi-conference-focus/jicofo
index 34b5548..30fc870 100755
--- a/docker/jitsi/jitsi-conference-focus/jicofo
+++ b/docker/jitsi/jitsi-conference-focus/jicofo
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+cp ${JITSI_CERTS_FOLDER}/auth.jitsi.deuxfleurs.fr.crt /usr/local/share/ca-certificates/auth.jitsi.deuxfleurs.fr.crt
+update-ca-certificates -f
+
 /srv/jicofo/jicofo.sh \
   --host=${JITSI_PROSODY_HOST} \
   --domain=jitsi.deuxfleurs.fr \
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_run b/docker/jitsi/jitsi-xmpp/xmpp_run
index ca2b7cf..8dfdf86 100755
--- a/docker/jitsi/jitsi-xmpp/xmpp_run
+++ b/docker/jitsi/jitsi-xmpp/xmpp_run
@@ -2,6 +2,7 @@
 
 /usr/local/bin/xmpp_conf
 cp ${JITSI_CERTS_FOLDER}/* /var/lib/prosody/
+chown -R prosody:prosody /var/lib/prosody
 
 mkdir -p /usr/local/share/ca-certificates/
 ln -sf \