aboutsummaryrefslogtreecommitdiff
path: root/app/jitsi/build
diff options
context:
space:
mode:
Diffstat (limited to 'app/jitsi/build')
-rw-r--r--app/jitsi/build/jitsi-conference-focus/Dockerfile5
-rwxr-xr-xapp/jitsi/build/jitsi-xmpp/xmpp_prosody8
2 files changed, 9 insertions, 4 deletions
diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile
index e67b3de..525bffb 100644
--- a/app/jitsi/build/jitsi-conference-focus/Dockerfile
+++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile
@@ -3,9 +3,9 @@ FROM debian:buster AS builder
ARG PREFIXV
ARG VERSION
RUN apt-get update && \
- apt-get install -y openjdk-11-jdk maven wget unzip && \
- wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip
+ apt-get install -y openjdk-11-jdk-headless maven wget unzip
+RUN wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip
RUN unzip jicofo.zip && \
mv jicofo*${VERSION} jicofo && \
cd jicofo && \
@@ -20,6 +20,5 @@ 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-xmpp/xmpp_prosody b/app/jitsi/build/jitsi-xmpp/xmpp_prosody
index 4ae73f4..af179e5 100755
--- a/app/jitsi/build/jitsi-xmpp/xmpp_prosody
+++ b/app/jitsi/build/jitsi-xmpp/xmpp_prosody
@@ -1,3 +1,9 @@
#!/bin/bash
-cat /etc/prosody/accounts.txt | xargs -n3 prosodyctl register
+prosodyctl register focus auth.jitsi ${JICOFO_AUTH_PASSWORD}
+prosodyctl register jvb auth.jitsi ${JVB_AUTH_PASSWORD}
+
+# copied from jitsi-meet.postinst
+# Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
+prosodyctl mod_roster_command subscribe focus.jitsi focus@auth.jitsi
+
exec prosody