From b4855c6a66c0eda8019070b1de43fe3768397dcc Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Fri, 1 May 2020 23:24:17 +0200 Subject: [PATCH] Several improvements (see below); New default: Only last 3 speakers will be have active video - Remove Jitsi runtime config in case of Ansible tag teardown - Performance: DefautSet Jitsi Web config channelLastN using jitsi_web_channel_last_n - Adds submodule with the source of docker-jitsi-meet, which this role is based on. --- .gitmodules | 3 +++ README.md | 1 + defaults/main.yml | 3 ++- src | 1 + tasks/main.yml | 14 ++++++++++++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 src diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..48e98bc --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src"] + path = src + url = https://github.com/jitsi/docker-jitsi-meet.git diff --git a/README.md b/README.md index 3aeb877..7f1f5a4 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Role Variables | jitsi_jvb_auth_password | | | | jitsi_jvb_auth_user | | | | jitsi_jvb_stun_servers | | meet-jit-si-turnrelay.jitsi.net:443 | +| jitsi_web_channel_last_n | Performance: Limit video streams to the last N speakers (-1 = unlimited) | 3 | | jitsi_public_url | The public URL under which Jitsi Meet can be accessed | http://localhost | | jitsi_timezone | | Europe/Amsterdam | | jitsi_virtual_host | The virtual host that is e.g. used by Traefik, usually part of the public url | localhost | diff --git a/defaults/main.yml b/defaults/main.yml index 79fdff6..3ef7926 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,4 +8,5 @@ jitsi_exposed_https_port: 8443 jitsi_virtual_host: localhost jitsi_public_url: http://{{ jitsi_virtual_host }} jitsi_timezone: Europe/Amsterdam -jitsi_jvb_stun_servers: meet-jit-si-turnrelay.jitsi.net:443 \ No newline at end of file +jitsi_jvb_stun_servers: meet-jit-si-turnrelay.jitsi.net:443 +jitsi_web_channel_last_n: 3 \ No newline at end of file diff --git a/src b/src new file mode 160000 index 0000000..eae3f5c --- /dev/null +++ b/src @@ -0,0 +1 @@ +Subproject commit eae3f5ce2d7627afe4115f52a61cc7ae3e3e8a31 diff --git a/tasks/main.yml b/tasks/main.yml index fbc09e8..e819186 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -8,6 +8,12 @@ group: '{{ docker_user }}' tags: config +- name: "Teardown: Remove Jitsi runtime config" + file: + path: /home/{{ docker_user }}/jitsi/conf + state: absent + tags: ['never', 'teardown'] + - name: Ensure jitsi config directory exists file: path: /home/{{ docker_user }}/jitsi/conf @@ -67,6 +73,14 @@ host: localhost port: "{{ jitsi_exposed_http_port }}" +- name: "Config: Set channelLastN" + lineinfile: + path: /home/{{ docker_user }}/jitsi/conf/web/config.js + regexp: '(\s*)channelLastN:\s*[^,]+,' + line: '\1channelLastN: {{jitsi_web_channel_last_n|default("-1")}},' + backrefs: yes + tags: config + - name: "Test whether Jitsi is healthy from the outside" become: false uri: