diff --git a/app/docker-compose.yml b/app/docker-compose.yml index d8a6ab2..14a62b8 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -73,7 +73,7 @@ services: build: context: ./jitsi/build/jitsi-xmpp args: - VERSION: 0.11.2-1 + VERSION: 0.11.7-1~buster4 image: superboum/amd64_jitsi_xmpp:v9 plume: diff --git a/app/jitsi/build/jitsi-xmpp/Dockerfile b/app/jitsi/build/jitsi-xmpp/Dockerfile index b32953a..6357cc6 100644 --- a/app/jitsi/build/jitsi-xmpp/Dockerfile +++ b/app/jitsi/build/jitsi-xmpp/Dockerfile @@ -3,7 +3,13 @@ FROM debian:buster ARG VERSION RUN apt-get update && \ - apt-get install -y prosody=${VERSION} + apt-get install -y wget gnupg2 && \ + echo deb http://packages.prosody.im/debian buster main \ + | tee -a /etc/apt/sources.list && \ + wget https://prosody.im/files/prosody-debian-packages.key -O - \ + | apt-key add - && \ + apt-get update && \ + apt-get install -y prosody=${VERSION} lua-event RUN mkdir -p /usr/local/share/ca-certificates/ && \ ln -sf \ @@ -11,10 +17,11 @@ RUN mkdir -p /usr/local/share/ca-certificates/ && \ /usr/local/share/ca-certificates/auth.jitsi.crt && \ mkdir /run/prosody && \ touch /run/prosody/prosody.pid && \ - mkdir -p /var/lib/prosody + mkdir -p /var/lib/prosody && \ + chown -R prosody:prosody /var/lib/prosody /run/prosody -COPY xmpp_root /usr/local/bin/xmpp_root COPY xmpp_prosody /usr/local/bin/xmpp_prosody WORKDIR /var/lib/prosody -CMD ["/usr/local/bin/xmpp_root"] +USER prosody +CMD ["/usr/local/bin/xmpp_prosody"] diff --git a/app/jitsi/build/jitsi-xmpp/xmpp_prosody b/app/jitsi/build/jitsi-xmpp/xmpp_prosody index 1101302..4ae73f4 100755 --- a/app/jitsi/build/jitsi-xmpp/xmpp_prosody +++ b/app/jitsi/build/jitsi-xmpp/xmpp_prosody @@ -1,5 +1,3 @@ #!/bin/bash -chown -R prosody:prosody /var/lib/prosody /etc/prosody /run/prosody - cat /etc/prosody/accounts.txt | xargs -n3 prosodyctl register exec prosody diff --git a/app/jitsi/build/jitsi-xmpp/xmpp_root b/app/jitsi/build/jitsi-xmpp/xmpp_root deleted file mode 100755 index 293915f..0000000 --- a/app/jitsi/build/jitsi-xmpp/xmpp_root +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -chown -R prosody:prosody /var/lib/prosody /etc/prosody /run/prosody -exec su -s /bin/bash -c /usr/local/bin/xmpp_prosody - prosody diff --git a/app/jitsi/integration/README.md b/app/jitsi/integration/README.md index d2d25c1..7f334af 100644 --- a/app/jitsi/integration/README.md +++ b/app/jitsi/integration/README.md @@ -52,6 +52,10 @@ prosodyctl cert generate auth.jitsi prosodyctl cert generate jitsi ``` +## An example prosody configuration file + +https://github.com/jitsi/jitsi-meet/blob/master/doc/example-config-files/prosody.cfg.lua.example + ## Resources to understand jitsi - [jicofo/debian/postinst](https://github.com/jitsi/jicofo/blob/master/debian/postinst) diff --git a/app/jitsi/integration/docker-compose.yml b/app/jitsi/integration/docker-compose.yml index 0a4012a..64cd82d 100644 --- a/app/jitsi/integration/docker-compose.yml +++ b/app/jitsi/integration/docker-compose.yml @@ -3,12 +3,12 @@ services: jitsi-xmpp: image: superboum/amd64_jitsi_xmpp:v9 volumes: - - "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua" - - "./prosody/accounts.txt:/etc/prosody/accounts.txt" - - "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt" - - "./prosody/certs/jitsi.key:/var/lib/prosody/jitsi.key" - - "./prosody/certs/auth.jitsi.crt:/var/lib/prosody/auth.jitsi.crt" - - "./prosody/certs/auth.jitsi.key:/var/lib/prosody/auth.jitsi.key" + - "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro" + - "./prosody/accounts.txt:/etc/prosody/accounts.txt:ro" + - "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt:ro" + - "./prosody/certs/jitsi.key:/var/lib/prosody/jitsi.key:ro" + - "./prosody/certs/auth.jitsi.crt:/var/lib/prosody/auth.jitsi.crt:ro" + - "./prosody/certs/auth.jitsi.key:/var/lib/prosody/auth.jitsi.key:ro" 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 edb87c5..203cd15 100644 --- a/app/jitsi/integration/jicofo/jicofo.conf +++ b/app/jitsi/integration/jicofo/jicofo.conf @@ -241,9 +241,9 @@ jicofo { enabled = true hostname = "jitsi-xmpp" port = 5222 - #domain = + domain = "auth.jitsi" username = "focus" - password = "3x@mple01" + password = "xxx" // How long to wait for a response to a stanza before giving up. reply-timeout = 15 seconds diff --git a/app/jitsi/integration/prosody/prosody.cfg.lua b/app/jitsi/integration/prosody/prosody.cfg.lua index 5f18e2a..2f75d83 100644 --- a/app/jitsi/integration/prosody/prosody.cfg.lua +++ b/app/jitsi/integration/prosody/prosody.cfg.lua @@ -4,6 +4,7 @@ use_libevent = true component_interface = "0.0.0.0" component_ports = { 5347 } http_ports = { 5280 } +https_ports = {} -- Not sure all modules are required modules_enabled = { @@ -13,14 +14,13 @@ modules_enabled = { "dialback"; -- s2s dialback support "disco"; -- Service discovery "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - "compression"; -- Stream compression (requires the lua-zlib package installed) "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"; + --"smacks"; -- not shipped with prosody "carbons"; "mam"; "lastactivity"; @@ -28,11 +28,12 @@ modules_enabled = { "pubsub"; "adhoc"; "websocket"; - "http_altconnect"; + --"http_altconnect"; -- not shipped with prosody } log = { - "*console"; + --log less on console with warn="*console"; or err="*console" or more with debug="*console" + info="*console"; } VirtualHost "jitsi"