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/postgresql | |
| 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/postgresql')
| -rw-r--r-- | modules/apps/postgresql/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/apps/postgresql/default.nix b/modules/apps/postgresql/default.nix index bfbf4bd..5ed6615 100644 --- a/modules/apps/postgresql/default.nix +++ b/modules/apps/postgresql/default.nix @@ -5,7 +5,7 @@ let match toString ; inherit (lib) - concatMapStrings concatStringsSep filter filterAttrs foldAttrs foldl + concatMapStrings concatStringsSep filterAttrs foldAttrs filter foldl hasPrefix isBool isInt isList isString length mapAttrs' mapAttrsToList mkDefault mkIf mkOption nameValuePair types ; @@ -22,9 +22,7 @@ let keyrings = let - isKey = s: s != null && hasPrefix "/run/keys/" s; - keys = i: filter isKey [ i.server.ssl_key_file ]; - ik = mapAttrsToList (_: i: { "${i.user}" = keys i; } ) instances; + ik = mapAttrsToList (_: i: { "${i.user}" = [ i.server.ssl_key_file ]; } ) instances; in foldAttrs (l: r: l ++ r) [] ik; mkService = name: opts: |