diff options
| -rw-r--r-- | app/jitsi/build/jitsi-conference-focus/Dockerfile | 22 | ||||
| -rw-r--r-- | app/jitsi/integration/docker-compose.yml | 9 | ||||
| -rw-r--r-- | app/jitsi/integration/prosody/prosody.cfg.lua | 24 |
3 files changed, 41 insertions, 14 deletions
diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile index db50746..cb6b127 100644 --- a/app/jitsi/build/jitsi-conference-focus/Dockerfile +++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile @@ -1,14 +1,26 @@ FROM fedora:33 AS builder -RUN dnf install -y java-latest-openjdk-headless maven wget unzip +# unzip is required when executing the mvn package command +RUN dnf install -y java-latest-openjdk-headless maven git unzip ARG PREFIXV ARG VERSION -RUN wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip -RUN unzip jicofo.zip && \ - mv jicofo*${VERSION} jicofo && \ + +# Create a cache +RUN git clone https://github.com/superboum/jicofo && \ cd jicofo && \ - mvn package -DskipTests -Dassembly.skipAssembly=false && \ + mvn package -DskipTests -Dassembly.skipAssembly=false + +WORKDIR jicofo +# Ensure latest version is compiled +RUN git pull && \ + git checkout 194795ed2a3ca08c25322c99f1ee89d134e1e1a2 + +# Wild patch for debug, once it will work we can safely remove this dead code +#COPY jicofogit/src/main/kotlin/org/jitsi/jicofo/JicofoServices.kt src/main/kotlin/org/jitsi/jicofo/JicofoServices.kt +#COPY jicofogit/src/main/java/org/jitsi/impl/protocol/xmpp/XmppProtocolProvider.java src/main/java/org/jitsi/impl/protocol/xmpp/XmppProtocolProvider.java + +RUN mvn package -DskipTests -Dassembly.skipAssembly=false && \ unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \ mv jicofo-1.1-SNAPSHOT /srv/build diff --git a/app/jitsi/integration/docker-compose.yml b/app/jitsi/integration/docker-compose.yml index 2f8141a..146606c 100644 --- a/app/jitsi/integration/docker-compose.yml +++ b/app/jitsi/integration/docker-compose.yml @@ -17,15 +17,6 @@ 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 - - JICOFO_AUTH_PASSWORD=jicofopass # jitsi-meet: # image: superboum/amd64_jitsi_meet:v1 # ports: diff --git a/app/jitsi/integration/prosody/prosody.cfg.lua b/app/jitsi/integration/prosody/prosody.cfg.lua index 215bb5b..e5d86bb 100644 --- a/app/jitsi/integration/prosody/prosody.cfg.lua +++ b/app/jitsi/integration/prosody/prosody.cfg.lua @@ -1,3 +1,27 @@ +modules_enabled = { + "roster"; -- Allow users to have a roster. Recommended ;) + "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in. + "tls"; -- Add support for secure TLS on c2s/s2s connections + "dialback"; -- s2s dialback support + "disco"; -- Service discovery + "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + "version"; -- Replies to server version requests + "uptime"; -- Report how long server has been running + "time"; -- Let others know the time here on this server + "ping"; -- Replies to XMPP pings with pongs + "pep"; -- Enables users to publish their mood, activity, playing music and more + -- jitsi + --"smacks"; -- not shipped with prosody + "carbons"; + "mam"; + "lastactivity"; + "offline"; + "pubsub"; + "adhoc"; + "websocket"; + --"http_altconnect"; -- not shipped with prosody +} + plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" } log = { |