From ad9dc855569205987d619a2de6bd26936e0d56f5 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 23 Oct 2024 17:24:04 +0200 Subject: [PATCH 1/2] nixos/tests/jibri: use security.acme.default --- nixos/tests/jibri.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/jibri.nix b/nixos/tests/jibri.nix index 45e30af9a9a5..159ce01cd84b 100644 --- a/nixos/tests/jibri.nix +++ b/nixos/tests/jibri.nix @@ -22,9 +22,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { forceSSL = true; }; - security.acme.email = "me@example.org"; + security.acme.defaults.email = "me@example.org"; security.acme.acceptTerms = true; - security.acme.server = "https://example.com"; # self-signed only + security.acme.defaults.server = "https://example.com"; # self-signed only }; testScript = '' From 15b94a95ae02dfe75f51f2cca6911f04dab5532f Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 23 Oct 2024 18:54:03 +0200 Subject: [PATCH 2/2] nixos/tests/jibri: fix grep string --- nixos/tests/jibri.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/jibri.nix b/nixos/tests/jibri.nix index 159ce01cd84b..2046ea86d5ac 100644 --- a/nixos/tests/jibri.nix +++ b/nixos/tests/jibri.nix @@ -44,7 +44,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "journalctl -b -u prosody -o cat | grep -q 'Authenticated as jibri@auth.machine'", timeout=33 ) machine.wait_until_succeeds( - "cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Joined MUC: jibribrewery@internal.machine'", timeout=34 + "cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Joined MUC: jibribrewery@internal.auth.machine'", timeout=34 ) assert '"busyStatus":"IDLE","health":{"healthStatus":"HEALTHY"' in machine.succeed(