diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/docker-compose.yml | 5 | ||||
| -rw-r--r-- | app/jitsi/build/jitsi-conference-focus/Dockerfile | 9 | ||||
| -rw-r--r-- | app/jitsi/build/jitsi-xmpp/Dockerfile | 9 | ||||
| -rw-r--r-- | app/jitsi/integration/docker-compose.yml | 18 | ||||
| -rw-r--r-- | app/jitsi/integration/jicofo/jicofo.conf | 4 | ||||
| -rw-r--r-- | app/jitsi/integration/prosody/prosody.cfg.lua | 11 |
6 files changed, 31 insertions, 25 deletions
diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 72e6955..717e8ce 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -56,7 +56,7 @@ services: context: ./jitsi/build/jitsi-conference-focus args: # https://github.com/jitsi/jicofo - PREFIXV: stable/jitsi-meet_ + PREFIXV: jitsi-meet_ VERSION: 5463 image: superboum/amd64_jitsi_conference_focus:v7 @@ -65,7 +65,7 @@ services: context: ./jitsi/build/jitsi-videobridge args: # https://github.com/jitsi/jitsi-videobridge - PREFIXV: stable/jitsi-meet_ + PREFIXV: jitsi-meet_ VERSION: 5463 image: superboum/amd64_jitsi_videobridge:v17 @@ -73,6 +73,7 @@ services: build: context: ./jitsi/build/jitsi-xmpp args: + PREFIXV: jitsi-meet_ MEET_VERSION: 5463 PROSODY_VERSION: 0.11.7-1~buster4 image: superboum/amd64_jitsi_xmpp:v9 diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile index 525bffb..db50746 100644 --- a/app/jitsi/build/jitsi-conference-focus/Dockerfile +++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile @@ -1,10 +1,9 @@ -FROM debian:buster AS builder +FROM fedora:33 AS builder + +RUN dnf install -y java-latest-openjdk-headless maven wget unzip ARG PREFIXV ARG VERSION -RUN apt-get update && \ - 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 && \ @@ -13,7 +12,7 @@ RUN unzip jicofo.zip && \ unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \ mv jicofo-1.1-SNAPSHOT /srv/build -FROM debian:buster +FROM debian:bullseye RUN apt-get update && \ apt-get install -y openjdk-11-jre-headless ca-certificates diff --git a/app/jitsi/build/jitsi-xmpp/Dockerfile b/app/jitsi/build/jitsi-xmpp/Dockerfile index e3a8f8f..90aae76 100644 --- a/app/jitsi/build/jitsi-xmpp/Dockerfile +++ b/app/jitsi/build/jitsi-xmpp/Dockerfile @@ -1,11 +1,12 @@ FROM debian:buster as builder -ARG MEET_VERSION WORKDIR /tmp +ARG MEET_VERSION +ARG PREFIXV RUN apt-get update && \ - apt-get install -y wget unzip && \ - wget https://github.com/jitsi/jitsi-meet/archive/stable/jitsi-meet_${MEET_VERSION}.zip -O meet.zip && \ - unzip meet.zip && \ + apt-get install -y wget unzip +RUN wget https://github.com/jitsi/jitsi-meet/archive/${PREFIXV}${MEET_VERSION}.zip -O meet.zip +RUN unzip meet.zip && \ mv jitsi-meet-* jitsi-meet FROM debian:buster diff --git a/app/jitsi/integration/docker-compose.yml b/app/jitsi/integration/docker-compose.yml index 3aa3954..2f8141a 100644 --- a/app/jitsi/integration/docker-compose.yml +++ b/app/jitsi/integration/docker-compose.yml @@ -17,15 +17,15 @@ services: volumes: - "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro" - "./jicofo/jicofo.conf:/etc/jitsi/jicofo.conf:ro" -# environment: -# - JDOMAIN=jitsi -# - JHOST=jitsi-xmpp -# - JPORT=5347 -# - JSUBDOMAIN=focus -# - JICOFO_SECRET=jicofosecretpass -# - JUSERDOMAIN=auth.jitsi -# - JUSERNAME=focus@auth.jitsi -# - JICOFO_AUTH_PASSWORD=jicofopass + environment: + - JDOMAIN=jitsi + - JHOST=jitsi-xmpp + - JPORT=5347 + - JSUBDOMAIN=focus + - JICOFO_SECRET=jicofosecretpass + - JUSERDOMAIN=auth.jitsi + - JUSERNAME=focus + - JICOFO_AUTH_PASSWORD=jicofopass # jitsi-meet: # image: superboum/amd64_jitsi_meet:v1 # ports: diff --git a/app/jitsi/integration/jicofo/jicofo.conf b/app/jitsi/integration/jicofo/jicofo.conf index 477d37e..4ef175f 100644 --- a/app/jitsi/integration/jicofo/jicofo.conf +++ b/app/jitsi/integration/jicofo/jicofo.conf @@ -242,14 +242,14 @@ jicofo { hostname = "jitsi-xmpp" port = 5222 domain = "auth.jitsi" - username = "focus@auth.jitsi" + username = "focus" password = "jicofopass" // How long to wait for a response to a stanza before giving up. reply-timeout = 15 seconds // The JID/domain of the MUC service used for conferencing. - # conference-muc-jid = conference.example.com + conference-muc-jid = conference.jitsi // A flag to suppress the TLS certificate verification. disable-certificate-verification = false diff --git a/app/jitsi/integration/prosody/prosody.cfg.lua b/app/jitsi/integration/prosody/prosody.cfg.lua index 42831ce..215bb5b 100644 --- a/app/jitsi/integration/prosody/prosody.cfg.lua +++ b/app/jitsi/integration/prosody/prosody.cfg.lua @@ -1,4 +1,9 @@ plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" } + +log = { + --log less on console with warn="*console"; or err="*console" or more with debug="*console" + debug="*console"; +} daemonize = false use_libevent = true @@ -29,7 +34,7 @@ ssl = { } VirtualHost "jitsi" - -- enabled = false -- Remove this line to enable this host + enabled = true -- Remove this line to enable this host authentication = "anonymous" -- Properties below are modified by jitsi-meet-tokens package config -- and authentication above is switched to "token" @@ -67,7 +72,7 @@ Component "conference.jitsi" "muc" "muc_domain_mapper"; --"token_verification"; } - admins = { "focusUser@auth.jitsi" } + admins = { "focus@auth.jitsi" } muc_room_locking = false muc_room_default_public_jids = true @@ -77,7 +82,7 @@ Component "internal.auth.jitsi" "muc" modules_enabled = { "ping"; } - admins = { "focusUser@auth.jitsi", "jvb@auth.jitsi" } + admins = { "focus@auth.jitsi", "jvb@auth.jitsi" } muc_room_locking = false muc_room_default_public_jids = true |