mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge master into staging-next
This commit is contained in:
commit
9c8cef37d2
19 changed files with 149 additions and 41 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue