Merge pull request #34753 from noqqe/master

Multiple users with hashedPassword is broken in mosquitto

Changed files
+1 -1
nixos
modules
services
networking
+1 -1
nixos/modules/services/networking/mosquitto.nix
···
'' + concatStringsSep "\n" (
mapAttrsToList (n: c:
if c.hashedPassword != null then
-
"echo '${n}:${c.hashedPassword}' > ${cfg.dataDir}/passwd"
else optionalString (c.password != null)
"${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} ${c.password}"
) cfg.users);
···
'' + concatStringsSep "\n" (
mapAttrsToList (n: c:
if c.hashedPassword != null then
+
"echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd"
else optionalString (c.password != null)
"${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} ${c.password}"
) cfg.users);