legacy: implement "*" for salt-pillar lookup

2021-03-27 01:32:06 +01:00 · 2021-03-27 01:32:06 +01:00 · 3d2cfa4e8a
parent 37dd4550bb
commit 3d2cfa4e8a
2 changed files with 13 additions and 9 deletions
--- a/nix/lib/config/legacy.nix
+++ b/nix/lib/config/legacy.nix
@ -2,7 +2,7 @@

 let
  mainServer = "server1";
-  pillar = self.lib.saltPillarFor mainServer;
+  pillar = self.lib.saltPillarFor "*";

  renameAttr = from: to: attrset:
    builtins.foldl' (result: name:
--- a/nix/lib/salt-support/salt-pillar.nix
+++ b/nix/lib/salt-support/salt-pillar.nix
@ -12,6 +12,10 @@ let
  globToRegex = builtins.replaceStrings ["*"] [".*"];

  baseMatches =
+    if hostName == "*"
+    then
+      builtins.attrNames pillarBase
+    else
      builtins.filter (patterns:
        pkgs.lib.any (pattern:
          builtins.match (globToRegex pattern) hostName != null