From f58e00875d9c8e4da113ad793f136a1f2419854f Mon Sep 17 00:00:00 2001 From: illustris Date: Thu, 17 Jun 2021 21:11:15 +0530 Subject: [PATCH 1/7] jitsi-meet: stable/jitsi-meet_5390 -> stable/jitsi-meet_5963 (cherry picked from commit a415ec434fc8f4aa8d5ff7dadea6f8e196c74d5c) --- pkgs/servers/web-apps/jitsi-meet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 719fab87ead..cfe00e59a2e 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.4628"; + version = "1.0.5056"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "1kw4byy6mvqk3qd5nk5raka1bl9jp0kniszq6j5kc8nz3jql4qdz"; + sha256 = "0vmxy22zpgmvmg84y6rf9s8y3ann1xzhpaipz7fk9z4ykmkj5knw"; }; dontBuild = true; From 2df327ab56e972bf38d0bf57ba6625193e4fa872 Mon Sep 17 00:00:00 2001 From: illustris Date: Thu, 17 Jun 2021 21:18:34 +0530 Subject: [PATCH 2/7] jitsi-videobridge: 2.1-416 -> 2.1-508 (cherry picked from commit d0d7946c0307ee4417e989ebceb9d28ac2aa4414) --- pkgs/servers/jitsi-videobridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 35cd6906012..283164380b4 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.1-416-g2f43d1b4"; + version = "2.1-508-gb24f756c"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "0s9wmbba1nlpxaawzmaqg92882y5sfs2ws64w5sqvpi7n77hy54m"; + sha256 = "0kjsm3k7chgrfvvqxkp8xdw6wfrs122j4h8gcvyvpf9lg51p199g"; }; in stdenv.mkDerivation { From df1e470c4b3046e8c8f9ee3d5ced65793c1f7a24 Mon Sep 17 00:00:00 2001 From: illustris Date: Thu, 17 Jun 2021 21:20:09 +0530 Subject: [PATCH 3/7] jicofo: 1.0-690 -> 1.0-756 (cherry picked from commit aea0f9ce1f5deb8c3e425dfe6876810effd22b29) --- pkgs/servers/jicofo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index 49e40713a0a..37b5a1bfaa3 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-690"; + version = "1.0-756"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "1w5nz2p6scd7w0ac93vhxlk5i8in5160c0icwl27m4x4km9xf6al"; + sha256 = "07qmxqp1llpn8kh590iz35zk17c2k4yg7i43nb2l0sfm40crpwfz"; }; in stdenv.mkDerivation { From 27d38294c6a8cae5f5138225fca13e7498f06d20 Mon Sep 17 00:00:00 2001 From: illustris Date: Thu, 17 Jun 2021 23:44:10 +0530 Subject: [PATCH 4/7] nixos/jitsi-meet: Update jitsi prosody configs Changes made as per https://github.com/jitsi/jitsi-meet/commit/b6f7f8fba7ba81c5a0ab5477a1d103b7279bf38f (cherry picked from commit 34b9ba2e6161e68febe4312c96c089d707472d5e) --- nixos/modules/services/web-apps/jitsi-meet.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 2df762882fa..a98dd1f91c6 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -187,8 +187,8 @@ in ]; extraModules = [ "pubsub" ]; extraConfig = mkAfter '' - Component "focus.${cfg.hostName}" - component_secret = os.getenv("JICOFO_COMPONENT_SECRET") + Component "focus.${cfg.hostName}" "client_proxy" + target_address = "focus@auth.${cfg.hostName}" ''; virtualHosts.${cfg.hostName} = { enabled = true; @@ -254,6 +254,7 @@ in + optionalString cfg.prosody.enable '' ${config.services.prosody.package}/bin/prosodyctl register focus auth.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jicofo-user-secret)" ${config.services.prosody.package}/bin/prosodyctl register jvb auth.${cfg.hostName} "$(cat ${videobridgeSecret})" + ${config.services.prosody.package}/bin/prosodyctl mod_roster_command subscribe focus.${cfg.hostName} focus@auth.${cfg.hostName} # generate self-signed certificates if [ ! -f /var/lib/jitsi-meet.crt ]; then From 0e731085295a9c71fd7540a5bf6f3735126cd863 Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 18 Jun 2021 10:05:54 +0530 Subject: [PATCH 5/7] jitsi-meet-prosody: init at 1.0.5056 (cherry picked from commit 5e49c97d29455e39ba820228dc7ff7b034ecc6fb) --- pkgs/misc/jitsi-meet-prosody/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/misc/jitsi-meet-prosody/default.nix diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix new file mode 100644 index 00000000000..0ab939af0f7 --- /dev/null +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, dpkg, nixosTests }: + +stdenv.mkDerivation rec { + pname = "jitsi-meet-prosody"; + version = "1.0.5056"; + src = fetchurl { + url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; + sha256 = "06qxa9h2ry92xrk2jklp76nv3sl8nvykdvsqmhn33lz6q6vmw2xr"; + }; + + dontBuild = true; + + unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share + mv usr/share/jitsi-meet/prosody-plugins $out/share/ + runHook postInstall + ''; + + passthru.tests = { + single-node-smoke-test = nixosTests.jitsi-meet; + }; + + meta = with lib; { + description = "Prosody configuration for Jitsi Meet"; + longDescription = '' + This package contains configuration for Prosody to be used with Jitsi Meet. + ''; + homepage = "https://github.com/jitsi/jitsi-meet/"; + license = licenses.asl20; + maintainers = teams.jitsi.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f15e66f8ce..3c4252f2b17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19104,6 +19104,8 @@ in jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; + jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { }; + jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; kapowbang = callPackage ../servers/kapowbang { }; From fa8a6d7e0af51fa009c1afc4e9d3c8e599d62e04 Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 18 Jun 2021 10:22:14 +0530 Subject: [PATCH 6/7] nixos/jitsi-meet: include jitsi prosody plugins in prosody extraPluginPaths (cherry picked from commit e0089c38ca2f9f2b9a46ffcf74a9908f53d51459) --- nixos/modules/services/web-apps/jitsi-meet.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index a98dd1f91c6..997604754e4 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -186,6 +186,7 @@ in } ]; extraModules = [ "pubsub" ]; + extraPluginPaths = [ "${pkgs.jitsi-meet-prosody}/share/prosody-plugins" ]; extraConfig = mkAfter '' Component "focus.${cfg.hostName}" "client_proxy" target_address = "focus@auth.${cfg.hostName}" From 8b5fcedfc99a58bdc2db416fc7959e044e4cb9be Mon Sep 17 00:00:00 2001 From: illustris Date: Sun, 20 Jun 2021 11:22:12 +0530 Subject: [PATCH 7/7] nixos/jitsi-meet: update nixos tests - remove check for `connected .JID: focus@auth.server` because - log format was changed in https://github.com/jitsi/jicofo/commit/c1945ea6cb3dd7c815e963768abc9a3fab57101e - connection.getUser() in jicofo also appears to be broken, returning null instead of username - testing for this log line shouldn't be necessary, as we also test for "Authenticated as focus@auth.server" - remove check for `External component successfully authenticated` because - [JVB no longer uses component](https://community.jitsi.org/t/jvb-not-connecting/91157/2) - increase VM memory (cherry picked from commit 85aa4bf92b34a4774f7443a87ab3524bfd152002) --- nixos/tests/jitsi-meet.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index dec49c83121..f9a0b121a2b 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -8,6 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { client = { nodes, pkgs, ... }: { }; server = { config, pkgs, ... }: { + virtualisation.memorySize = 512; services.jitsi-meet = { enable = true; hostName = "server"; @@ -36,15 +37,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { server.wait_until_succeeds( "journalctl -b -u jitsi-videobridge2 -o cat | grep -q 'Performed a successful health check'" ) - server.wait_until_succeeds( - "journalctl -b -u jicofo -o cat | grep -q 'connected .JID: focus@auth.server'" - ) server.wait_until_succeeds( "journalctl -b -u prosody -o cat | grep -q 'Authenticated as focus@auth.server'" ) - server.wait_until_succeeds( - "journalctl -b -u prosody -o cat | grep -q 'focus.server:component: External component successfully authenticated'" - ) server.wait_until_succeeds( "journalctl -b -u prosody -o cat | grep -q 'Authenticated as jvb@auth.server'" )