public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot]
2021-07-10 00:02:34 +00:00
committed by GitHub
parent 86455fbb91 8b5fcedfc9
commit 9b0fff08dc
7 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/web-apps/jitsi-meet.nix
+4 -2
View File
@@ -186,9 +186,10 @@ in
}
];
extraModules = [ "pubsub" ];
extraPluginPaths = [ "${pkgs.jitsi-meet-prosody}/share/prosody-plugins" ];
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 +255,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
nixos/tests/jitsi-meet.nix
+1 -6
View File
@@ -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'"
)