diff --git a/nixos/modules/services/networking/jibri/default.nix b/nixos/modules/services/networking/jibri/default.nix
index b4e41a292826..4aa60e31052f 100644
--- a/nixos/modules/services/networking/jibri/default.nix
+++ b/nixos/modules/services/networking/jibri/default.nix
@@ -86,7 +86,7 @@ let
in
{
options.services.jibri = with types; {
- enable = mkEnableOption "Jitsi BRoadcasting Infrastructure. Currently the only supported way of enabling a jibri instance is with ";
+ enable = mkEnableOption "Jitsi BRoadcasting Infrastructure. Currently Jibri must be run on a host that is also running , so for most use cases it will be simpler to run ";
config = mkOption {
type = attrs;
default = { };
@@ -142,6 +142,34 @@ in
description = ''
XMPP servers to connect to.
'';
+ example = literalExpression ''
+ "jitsi-meet" = {
+ xmppServerHosts = [ "localhost" ];
+ xmppDomain = config.services.jitsi-meet.hostName;
+
+ control.muc = {
+ domain = "internal.''${config.services.jitsi-meet.hostName}";
+ roomName = "JibriBrewery";
+ nickname = "jibri";
+ };
+
+ control.login = {
+ domain = "auth.''${config.services.jitsi-meet.hostName}";
+ username = "jibri";
+ passwordFile = "/var/lib/jitsi-meet/jibri-auth-secret";
+ };
+
+ call.login = {
+ domain = "recorder.''${config.services.jitsi-meet.hostName}";
+ username = "recorder";
+ passwordFile = "/var/lib/jitsi-meet/jibri-recorder-secret";
+ };
+
+ usageTimeout = "0";
+ disableCertificateVerification = true;
+ stripFromRoomDomain = "conference.";
+ };
+ '';
default = { };
type = attrsOf (submodule ({ name, ... }: {
options = {
diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix
index 8dc611c32e38..2f1c4acec1e8 100644
--- a/nixos/modules/services/web-apps/jitsi-meet.nix
+++ b/nixos/modules/services/web-apps/jitsi-meet.nix
@@ -52,7 +52,7 @@ in
type = str;
example = "meet.example.org";
description = ''
- Hostname of the Jitsi Meet instance.
+ FQDN of the Jitsi Meet instance.
'';
};
@@ -140,9 +140,8 @@ in
description = ''
Whether to enable a Jibri instance and configure it to connect to Prosody.
- Although additional configuration is possible with , this is
- currently not very supported and most users will only want to edit the finalize recordings
- script at .
+ Additional configuration is possible with , and
+ is especially useful.
'';
};
@@ -409,7 +408,8 @@ in
bridgeMuc = "jvbbrewery@internal.${cfg.hostName}";
config = mkMerge [{
"org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED" = "true";
- } (lib.mkIf cfg.jibri.enable {
+ #} (lib.mkIf cfg.jibri.enable {
+ } (lib.mkIf (config.services.jibri.enable || cfg.jibri.enable) {
"org.jitsi.jicofo.jibri.BREWERY" = "JibriBrewery@internal.${cfg.hostName}";
"org.jitsi.jicofo.jibri.PENDING_TIMEOUT" = "90";
})];