From b40e89f23632d3fabe95bbf214bb77a32567b3d9 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Thu, 13 Oct 2016 16:21:52 +0300 Subject: Do not filter keys at application level It's done in the nixsap.deployment module See b24ae5d345aa84bdba20efbb4a14ddfc9bf39873 --- modules/apps/postgresql/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'modules/apps/postgresql') 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: -- cgit v1.2.3