roles/jibri/tasks/main.yml

@@ -99,7 +99,7 @@
 
 - name: Override jibri java path
   copy:
-    content: "[Service]\nEnvironment=PATH=/usr/lib/jvm/adoptopenjdk-8-hotspot-jre-amd64/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin"
+    content: "[Service]\nEnvironment=PATH=/usr/lib/jvm/java-11-openjdk-amd64/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin"
     dest: /etc/systemd/system/jibri.service.d/override.conf
   register: jibrioverride
 

roles/jitsi-videobridge/files/jitsi-key.gpg.key

------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-=xG9N
------END PGP PUBLIC KEY BLOCK-----

roles/jitsi-videobridge/tasks/main.yml

 - name: Install Jitsi APT Key
-  apt_key:
-    data: "{{ lookup('file', 'jitsi-key.gpg.key') }}"
-    state: present
+  copy:
+    src: jitsi-key.gpg
+    dest: /usr/share/keyrings/jitsi-keyring.gpg
+  tags: jitsiapt
 
 - name: Add Jitsi APT repository
   copy:
-    content: "deb https://download.jitsi.org stable/"
+    content: "deb [signed-by=/usr/share/keyrings/jitsi-keyring.gpg] https://download.jitsi.org stable/"
     dest: /etc/apt/sources.list.d/jitsi-stable.list
   register: jitsiapt
 

roles/jitsi-videobridge/templates/jvb.conf.j2

@@ -33,5 +33,12 @@ videobridge {
         server-id = "{{ inventory_hostname }}"
         tls = true
     }
+    cc {
+        max-time-between-calculations = 5 seconds
+        bwe-change-threshold = 0.1
+        padding-period = 10ms
+        jvb-last-n = -1
+        trust-bwe = true
+    }
 }
 

roles/jitsi/files/dehydrated-hook.sh

+#!/usr/bin/env bash
+
+deploy_cert() {
+    local DOMAIN="${1}" KEYFILE="${2}" CERTFILE="${3}" FULLCHAINFILE="${4}" CHAINFILE="${5}" TIMESTAMP="${6}"
+
+    cp "${KEYFILE}" "${FULLCHAINFILE}" /etc/nginx/ssl/
+    systemctl reload nginx
+    prosodyctl --root cert import $DOMAIN /etc/dehydrated/certs/
+}
+
+HANDLER="$1"; shift
+if [[ "${HANDLER}" =~ ^(deploy_cert)$ ]]; then
+  "$HANDLER" "$@"
+fi

roles/jitsi/tasks/main.yml

+- name: Install custom dehydrated hook
+  copy:
+    src: dehydrated-hook.sh
+    dest: /etc/dehydrated/custom-hook.sh
+    mode: 0755
+
 - name: Install Jitsi APT Key
   copy:
     src: jitsi-key.gpg
@@ -152,8 +158,7 @@
     - title.html
     - interface_config.js
     - logging_config.js
-    - sounds/left.wav
-    - sounds/joined.wav
+    - sounds/reactions-boo.mp3
   tags: html
 
 - name: Use welcome-background.jpg instead of png
@@ -190,7 +195,6 @@
       - uwsgi
       - uwsgi-plugin-python3
       - python3-passlib
-      - python-passlib
     state: latest
   tags: modapi
 

roles/jitsi/templates/jitsi/jicofo/jicofo.conf.j2

@@ -11,4 +11,11 @@ jicofo {
         port = 8888
         tls-port = 8843
     }
+
+    xmpp: {
+      client: {
+        client-proxy: focus.{{ inventory_hostname }}
+      }
+      trusted-domains: [ "recorder.{{ inventory_hostname }}" ]
+    }
 }

roles/jitsi/templates/prosody/vhost.cfg.lua.j2

+unlimited_jids = { "focus@auth.meet.fslab.de", "jvb@auth.meet.fslab.de" }
+
 -- Plugins path gets uncommented during jitsi-meet-tokens package install - that's where token plugin is located
---plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }
+plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }
 
 component_ports = { 5347 }
 component_interface = "0.0.0.0"
@@ -28,27 +30,24 @@ VirtualHost "{{ inventory_hostname }}"
             "ping"; -- Enable mod_ping
             "websocket";
             "turncredentials";
-            -- "smacks";
+            --"smacks";
         }
 
         c2s_require_encryption = false
 
 turncredentials_secret = "{{ jitsi_turn_secret }}";
 turncredentials = {
-  { type = "stun", host = "turn1.meet.fslab.de", port = 443 },
-  { type = "stun", host = "turn2.meet.fslab.de", port = 443 },
-  { type = "turn", host = "turn1.meet.fslab.de", port = 443, transport = "udp" },
-  { type = "turn", host = "turn2.meet.fslab.de", port = 443, transport = "udp" },
-  { type = "turns", host = "turn1.meet.fslab.de", port = 443, transport = "tcp" },
-  { type = "turns", host = "turn2.meet.fslab.de", port = 443, transport = "tcp" }
+  { type = "turn", host = "turn.fslab.de", port = 443, transport = "udp" },
+  { type = "turns", host = "turn.fslab.de", port = 443, transport = "tcp" }
 }
 
 admins = { "focus@auth.{{ inventory_hostname }}" }
 
 VirtualHost "auth.{{ inventory_hostname }}"
+    modules_enabled = { "limits_exception"; }
     ssl = {
-        key = "/etc/prosody/certs/auth.{{ inventory_hostname }}.key";
-        certificate = "/etc/prosody/certs/auth.{{ inventory_hostname }}.crt";
+        key = "/etc/prosody/certs/{{ inventory_hostname }}.key";
+        certificate = "/etc/prosody/certs/{{ inventory_hostname }}.crt";
     }
     authentication = "internal_plain"
 
@@ -60,11 +59,13 @@ Component "internal-muc.{{ inventory_hostname }}" "muc"
     muc_room_cache_size = 1000
 
 Component "conference.{{ inventory_hostname }}" "muc"
+    restrict_room_creation = true
     storage = "memory"
     muc_room_locking = false
     muc_room_default_public_jids = true
 
-Component "focus.{{ inventory_hostname }}"
+Component "focus.{{ inventory_hostname }}" "client_proxy"
+    target_address = "focus@auth.meet.fslab.de"
     component_secret = "{{ jitsi_jicofo_secret }}"
 
 VirtualHost "recorder.{{ inventory_hostname }}"
@@ -72,3 +73,10 @@ VirtualHost "recorder.{{ inventory_hostname }}"
         "ping";
     }
     authentication = "internal_plain"
+
+Component "internal.auth.meet.fslab.de" "muc"
+    storage = "memory"
+    modules_enabled = { "ping"; }
+    admins = { "focus@auth.{{ inventory_hostname }}", "jvb@auth.{{ inventory_hostname }}" }
+    muc_room_locking = false
+    muc_room_default_public_jids = true

nginx @ 4e375e3f

-Subproject commit 0bc209a25ea2c594c9aebd39050ec6dc14e8da49
+Subproject commit 4e375e3fb3ad1f28e83fc3fde1acbd1f61767b19