commit 917c5fae70f9d8ec43653e5a6e3ea764ce7bd2c8 · pyrox.dev/nixpkgs

+29 -1

nixos/modules/services/networking/jibri/default.nix

···

       86
       86
        
       in

     

       87
       87
        
       {

     

       88
       88
        
         options.services.jibri = with types; {

     

       89
       89
       -
           enable = mkEnableOption "Jitsi BRoadcasting Infrastructure. Currently the only supported way of enabling a jibri instance is with <option>services.jitsi-meet.jibri.enable</option>";

     

       89
       89
       +
           enable = mkEnableOption "Jitsi BRoadcasting Infrastructure. Currently Jibri must be run on a host that is also running <option>services.jitsi-meet.enable</option>, so for most use cases it will be simpler to run <option>services.jitsi-meet.jibri.enable</option>";

     

       90
       90
        
           config = mkOption {

     

       91
       91
        
             type = attrs;

     

       92
       92
        
             default = { };

     
···

       141
       141
        
           xmppEnvironments = mkOption {

     

       142
       142
        
             description = ''

     

       143
       143
        
               XMPP servers to connect to.

     

       144
       144
       +
             '';

     

       145
       145
       +
             example = literalExpression ''

     

       146
       146
       +
               "jitsi-meet" = {

     

       147
       147
       +
                 xmppServerHosts = [ "localhost" ];

     

       148
       148
       +
                 xmppDomain = config.services.jitsi-meet.hostName;

     

       149
       149
       +
       

     

       150
       150
       +
                 control.muc = {

     

       151
       151
       +
                   domain = "internal.''${config.services.jitsi-meet.hostName}";

     

       152
       152
       +
                   roomName = "JibriBrewery";

     

       153
       153
       +
                   nickname = "jibri";

     

       154
       154
       +
                 };

     

       155
       155
       +
       

     

       156
       156
       +
                 control.login = {

     

       157
       157
       +
                   domain = "auth.''${config.services.jitsi-meet.hostName}";

     

       158
       158
       +
                   username = "jibri";

     

       159
       159
       +
                   passwordFile = "/var/lib/jitsi-meet/jibri-auth-secret";

     

       160
       160
       +
                 };

     

       161
       161
       +
       

     

       162
       162
       +
                 call.login = {

     

       163
       163
       +
                   domain = "recorder.''${config.services.jitsi-meet.hostName}";

     

       164
       164
       +
                   username = "recorder";

     

       165
       165
       +
                   passwordFile = "/var/lib/jitsi-meet/jibri-recorder-secret";

     

       166
       166
       +
                 };

     

       167
       167
       +
       

     

       168
       168
       +
                 usageTimeout = "0";

     

       169
       169
       +
                 disableCertificateVerification = true;

     

       170
       170
       +
                 stripFromRoomDomain = "conference.";

     

       171
       171
       +
               };

     

       144
       172
        
             '';

     

       145
       173
        
             default = { };

     

       146
       174
        
             type = attrsOf (submodule ({ name, ... }: {

+5 -5

nixos/modules/services/web-apps/jitsi-meet.nix

···

       52
       52
        
             type = str;

     

       53
       53
        
             example = "meet.example.org";

     

       54
       54
        
             description = ''

     

       55
       55
       -
               Hostname of the Jitsi Meet instance.

     

       55
       55
       +
               FQDN of the Jitsi Meet instance.

     

       56
       56
        
             '';

     

       57
       57
        
           };

     

       58
       58
        
       

     
···

       140
       140
        
             description = ''

     

       141
       141
        
               Whether to enable a Jibri instance and configure it to connect to Prosody.

     

       142
       142
        
       

     

       143
       143
       -
               Although additional configuration is possible with <option>services.jibri</option>, this is

     

       144
       144
       -
               currently not very supported and most users will only want to edit the finalize recordings

     

       145
       145
       -
               script at <option>services.jibri.finalizeScript</option>.

     

       143
       143
       +
               Additional configuration is possible with <option>services.jibri</option>, and

     

       144
       144
       +
               <option>services.jibri.finalizeScript</option> is especially useful.

     

       146
       145
        
             '';

     

       147
       146
        
           };

     

       148
       147
        
       

     
···

       409
       408
        
             bridgeMuc = "jvbbrewery@internal.${cfg.hostName}";

     

       410
       409
        
             config = mkMerge [{

     

       411
       410
        
               "org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED" = "true";

     

       412
       412
       -
             } (lib.mkIf cfg.jibri.enable {

     

       411
       411
       +
             #} (lib.mkIf cfg.jibri.enable {

     

       412
       412
       +
              } (lib.mkIf (config.services.jibri.enable || cfg.jibri.enable) {

     

       413
       413
        
               "org.jitsi.jicofo.jibri.BREWERY" = "JibriBrewery@internal.${cfg.hostName}";

     

       414
       414
        
               "org.jitsi.jicofo.jibri.PENDING_TIMEOUT" = "90";

     

       415
       415
        
             })];