nixos/mosquitto: fix attribute path display in assertions

main
pennae 2 years ago
parent 2145dbc4fc
commit c1115d37ff
  1. 6
      nixos/modules/services/networking/mosquitto.nix

@ -296,7 +296,7 @@ let
}; };
listenerAsserts = prefix: listener: listenerAsserts = prefix: listener:
assertKeysValid prefix freeformListenerKeys listener.settings assertKeysValid "${prefix}.settings" freeformListenerKeys listener.settings
++ userAsserts prefix listener.users ++ userAsserts prefix listener.users
++ imap0 ++ imap0
(i: v: authAsserts "${prefix}.authPlugins.${toString i}" v) (i: v: authAsserts "${prefix}.authPlugins.${toString i}" v)
@ -398,7 +398,7 @@ let
}; };
bridgeAsserts = prefix: bridge: bridgeAsserts = prefix: bridge:
assertKeysValid prefix freeformBridgeKeys bridge.settings assertKeysValid "${prefix}.settings" freeformBridgeKeys bridge.settings
++ [ { ++ [ {
assertion = length bridge.addresses > 0; assertion = length bridge.addresses > 0;
message = "Bridge ${prefix} needs remote broker addresses"; message = "Bridge ${prefix} needs remote broker addresses";
@ -527,7 +527,7 @@ let
globalAsserts = prefix: cfg: globalAsserts = prefix: cfg:
flatten [ flatten [
(assertKeysValid prefix freeformGlobalKeys cfg.settings) (assertKeysValid "${prefix}.settings" freeformGlobalKeys cfg.settings)
(imap0 (n: l: listenerAsserts "${prefix}.listener.${toString n}" l) cfg.listeners) (imap0 (n: l: listenerAsserts "${prefix}.listener.${toString n}" l) cfg.listeners)
(mapAttrsToList (n: b: bridgeAsserts "${prefix}.bridge.${n}" b) cfg.bridges) (mapAttrsToList (n: b: bridgeAsserts "${prefix}.bridge.${n}" b) cfg.bridges)
]; ];

Loading…
Cancel
Save