aboutsummaryrefslogtreecommitdiff
path: root/app/jitsi/build/jitsi-conference-focus
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-01-28 17:52:41 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-01-28 17:52:41 +0100
commit7b57ff72a918ca295e2b00e76da33eec700c6a2a (patch)
tree6f19d8c5260cadc3535ee3343f662d4217719c23 /app/jitsi/build/jitsi-conference-focus
parentebb772e5ba26944ac002c236d33ef164e91c6a7d (diff)
downloadinfrastructure-7b57ff72a918ca295e2b00e76da33eec700c6a2a.tar.gz
infrastructure-7b57ff72a918ca295e2b00e76da33eec700c6a2a.zip
Simplify prosody too
Diffstat (limited to 'app/jitsi/build/jitsi-conference-focus')
-rw-r--r--app/jitsi/build/jitsi-conference-focus/Dockerfile1
-rwxr-xr-xapp/jitsi/build/jitsi-conference-focus/jicofo7
2 files changed, 2 insertions, 6 deletions
diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile
index f78cc78..e67b3de 100644
--- a/app/jitsi/build/jitsi-conference-focus/Dockerfile
+++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile
@@ -20,5 +20,6 @@ RUN apt-get update && \
COPY --from=builder /srv/build /usr/share/jicofo
COPY jicofo /usr/local/bin
+ENV JICOFO_SECRET=IAMDEPRECATED
CMD ["/usr/local/bin/jicofo"]
diff --git a/app/jitsi/build/jitsi-conference-focus/jicofo b/app/jitsi/build/jitsi-conference-focus/jicofo
index bfc54f6..31cd9c4 100755
--- a/app/jitsi/build/jitsi-conference-focus/jicofo
+++ b/app/jitsi/build/jitsi-conference-focus/jicofo
@@ -16,9 +16,4 @@ exec java \
-Djava.util.logging.config.file=/usr/share/jicofo/lib/logging.properties \
-Dconfig.file=/etc/jitsi/jicofo.conf \
-cp "/usr/share/jicofo/*:/usr/share/jicofo/lib/*" \
- org.jitsi.jicofo.Main \
- --host=${JITSI_PROSODY_HOST} \
- --domain=jitsi.deuxfleurs.fr \
- --secret=${JITSI_SECRET_JICOFO_COMPONENT} \
- --user_domain=auth.jitsi.deuxfleurs.fr \
- --user_password=${JITSI_SECRET_JICOFO_USER}
+ org.jitsi.jicofo.Main