nixos-infra jitsi prep

nixos/doc/manual/release-notes/rl-2405.section.md

@@ -135,6 +135,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
 
 - `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information.
 
+- `prosody` `services.prosody.muc.*.vcard_muc` was removed in favor of `services.prosody.muc.*.extraModules`.
+
 - `k9s` was updated to v0.31. There have been various breaking changes in the config file format,
   check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0),
   [v0.30](https://github.com/derailed/k9s/releases/tag/v0.30.0) and

nixos/modules/services/networking/prosody.nix

@@ -336,10 +336,10 @@ let
         '';
       };
 
-      vcard_muc = mkOption {
-        type = types.bool;
-        default = true;
-      description = lib.mdDoc "Adds the ability to set vCard for Multi User Chat rooms";
+      extraModules = mkOption {
+        type = types.listOf types.str;
+        default = [ "muc_mam" "vcard_muc" ];
+        description = "Add more modules to the muc Component";
       };
 
       # Extra parameters. Defaulting to prosody default values.
@@ -814,7 +814,9 @@ in
 
       ${lib.concatMapStrings (muc: ''
         Component ${toLua muc.domain} "muc"
-            modules_enabled = { "muc_mam"; ${optionalString muc.vcard_muc ''"vcard_muc";'' } }
+            modules_enabled = {
+            ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") muc.extraModules)}
+            }
             name = ${toLua muc.name}
             restrict_room_creation = ${toLua muc.restrictRoomCreation}
             max_history_messages = ${toLua muc.maxHistoryMessages}

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

@@ -189,6 +189,19 @@ in
     };
 
     secureDomain.enable = mkEnableOption (lib.mdDoc "Authenticated room creation");
+
+    updateMucs = mkOption {
+      type = with types; attrsOf anything;
+      default = { };
+      description = "This is a very hacky work around setting and only added because prosody muc is a list.";
+      example = {
+        "conference.jitsi.example.com".extraModules = [
+          "lobby_autostart"
+          "muc_mam"
+          "vcard_muc"
+        ];
+      };
+    };
   };
 
   config = mkIf cfg.enable {
@@ -205,7 +218,16 @@ in
         tls = mkDefault true;
         websocket = mkDefault true;
       };
-      muc = [
+      # the piece of code bellow looks at the domain name of the attrs in the list and updates the attrs if the domain name matches.
+      # this is done to allow adding/overriding settings in a convenient way
+      muc = lib.flatten (builtins.map (muc:
+        let
+          result = lib.mapAttrsToList (
+            n: v: if muc.domain == n then (lib.recursiveUpdate muc v) else null
+          ) cfg.updateMucs;
+        in
+        if result == [ null ] then muc else result
+      ) [
         {
           domain = "conference.${cfg.hostName}";
           name = "Jitsi Meet MUC";
@@ -249,7 +271,7 @@ in
             storage = "memory"
           '';
         }
-      ];
+      ]);
       extraModules = [
         "pubsub"
         "smacks"

nixos/tests/jitsi-meet.nix

@@ -11,7 +11,16 @@ import ./make-test-python.nix ({ pkgs, ... }: {
       services.jitsi-meet = {
         enable = true;
         hostName = "server";
+        updateMucs = { "conference.jitsi.example.com".extraModules = [
+            "lobby_autostart"
+            "muc_mam"
+            "vcard_muc"
+          ];
+        };
       };
+
+      services.prosody.extraPluginPaths = [ "${pkgs.jitsi-prosody-plugins}/lobby_autostart" ];
+
       services.jitsi-videobridge.openFirewall = true;
 
       networking.firewall.allowedTCPPorts = [ 80 443 ];

pkgs/by-name/ji/jitsi-prosody-plugins/package.nix

@@ -0,0 +1,38 @@
+{ lib
+, fetchFromGitHub
+, stdenvNoCC
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "jitsi-prosody-plugins";
+  version = "20240318";
+
+  src = fetchFromGitHub {
+    owner = "jitsi-contrib";
+    repo = "prosody-plugins";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-ZApx7Z08dr1EFL5eelFG3IrfrAOpg5JqUX6hbodGwuo=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    rm LICENSE README.md */README*.md
+    rm -r images */docs
+    cp -r * $out/
+
+    runHook postInstall
+  '';
+
+  # nothing todo here
+  dontBuild = true;
+  dontConfigure = true;
+  dontFixup = true;
+
+  meta = with lib; {
+    description = "Prosody plugins for Jitsi";
+    homepage = "https://github.com/jitsi-contrib/prosody-plugins";
+    license = lib.licenses.apsl20;
+    maintainers = with lib.maintainers; [ janik ];
+  };
+})