Unverified Commit cb771a25 authored by lassulus's avatar lassulus Committed by GitHub
Browse files

jitsi-meet: fix infinite recursion with prosody package (#432371)

parents 9a00fd89 804919a7

nixos/modules/services/networking/prosody.nix

+7 −11
Original line number Diff line number Diff line
@@ -585,18 +585,14 @@ let 
            ${muc.extraConfig}

      '') cfg.muc}



      ${

        lib.optionalString (cfg.httpFileShare != null) ''

      ${lib.optionalString (cfg.httpFileShare != null) ''

        Component ${toLua cfg.httpFileShare.domain} "http_file_share"

          modules_disabled = { "s2s" }

        ''

        + lib.optionalString (cfg.httpFileShare.http_host != null) ''

        ${lib.optionalString (cfg.httpFileShare.http_host != null) ''

          http_host = "${cfg.httpFileShare.http_host}"

        ''

        + ''

        ''}

        ${settingsToLua "  http_file_share_" (cfg.httpFileShare // { domain = null; })}

        ''

      }

      ''}



      ${lib.concatStringsSep "\n" (

        lib.mapAttrsToList (n: v: ''

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

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ in 


      # required for muc_breakout_rooms

      package = lib.mkDefault (

        config.services.prosody.package.override {

        pkgs.prosody.override {

          withExtraLuaPackages = p: with p; [ cjson ];

        }

      );