diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2016-10-13 16:21:52 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2016-10-13 16:27:34 +0300 |
| commit | b40e89f23632d3fabe95bbf214bb77a32567b3d9 (patch) | |
| tree | a76f8222e93152f3886008ad6ef7b6eadbe401ba /modules/apps/jenkins | |
| parent | b24ae5d345aa84bdba20efbb4a14ddfc9bf39873 (diff) | |
| download | nixsap-b40e89f23632d3fabe95bbf214bb77a32567b3d9.tar.gz | |
Do not filter keys at application level
It's done in the nixsap.deployment module
See b24ae5d345aa84bdba20efbb4a14ddfc9bf39873
Diffstat (limited to 'modules/apps/jenkins')
| -rw-r--r-- | modules/apps/jenkins/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/apps/jenkins/default.nix b/modules/apps/jenkins/default.nix index d0ccb25..a5edb4b 100644 --- a/modules/apps/jenkins/default.nix +++ b/modules/apps/jenkins/default.nix @@ -6,7 +6,7 @@ let attrNames isBool isString ; inherit (lib) - concatMapStringsSep concatStringsSep escape filter filterAttrs + concatMapStringsSep concatStringsSep escape filterAttrs foldAttrs foldl hasPrefix mapAttrs mapAttrsToList mkOption nameValuePair optionalString ; @@ -14,7 +14,6 @@ let attrsOf submodule ; explicit = filterAttrs (n: v: n != "_module" && v != null); - isKey = s: s != null && hasPrefix "/run/keys/" s; instances = explicit config.nixsap.apps.jenkins; users = mapAttrsToList (_: i: i.user) instances; @@ -26,10 +25,10 @@ let keyrings = let # This requires read-write mode of evaluation: - keys = n: i: filter isKey (import (pkgs.xinclude2nix ( + keys = n: i: import (pkgs.xinclude2nix ( (mapAttrsToList (_: f: f) (configFiles n i)) ++ (mapAttrsToList (_: f: f) (jobFiles n i)) - ))); + )); ik = mapAttrsToList (n: i: { "${i.user}" = keys n i; } ) instances; in foldAttrs (l: r: l ++ r) [] ik; |