Merge master into staging-next

Author: nixpkgs-ci[bot]

nixos/modules/services/networking/netbird/server.nix

@@ -56,7 +56,7 @@ in
       }
       // (optionalAttrs cfg.coturn.enable rec {
         turnDomain = cfg.domain;
-        turnPort = config.services.coturn.tls-listening-port;
+        turnPort = config.services.coturn.listening-port;
         # We cannot merge a list of attrsets so we have to redefine the whole list
         settings = {
           TURNConfig.Turns = mkDefault [

nixos/modules/services/search/opensearch.nix

@@ -210,6 +210,7 @@ in
               ln -sfT "${cfg.package}/plugins" "${cfg.dataDir}/plugins"
               ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
               ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules
+              ln -sfT ${cfg.package}/agent ${cfg.dataDir}/agent
 
               # opensearch needs to create the opensearch.keystore in the config directory
               # so this directory needs to be writable.