From 0e848bb2d0e705e5e0858fe8f2c02a3c9c8f45e5 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Thu, 28 Jan 2021 19:28:15 +0100
Subject: Polished prosody

---
 app/jitsi/integration/README.md               |  4 ++++
 app/jitsi/integration/docker-compose.yml      | 12 ++++++------
 app/jitsi/integration/jicofo/jicofo.conf      |  4 ++--
 app/jitsi/integration/prosody/prosody.cfg.lua |  9 +++++----
 4 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'app/jitsi/integration')

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"
-- 
cgit v1.2.3