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/pgbackup.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/apps/pgbackup.nix') diff --git a/modules/apps/pgbackup.nix b/modules/apps/pgbackup.nix index 3428843..7f7c7ca 100644 --- a/modules/apps/pgbackup.nix +++ b/modules/apps/pgbackup.nix @@ -4,7 +4,7 @@ let inherit (builtins) elem isBool isList isString toString ; inherit (lib) - concatMapStringsSep concatStringsSep filter filterAttrs + concatMapStringsSep concatStringsSep filterAttrs findFirst flatten hasPrefix mapAttrsToList mkIf mkOption optionalString removeSuffix ; inherit (lib.types) @@ -252,7 +252,7 @@ let exit "$failed" ''; - keys = filter (f: f != null && hasPrefix "/run/keys/" f) ( [cfg.pgpass cfg.s3cfg] ); + keys = [ cfg.pgpass cfg.s3cfg ]; in { options.nixsap.apps.pgbackup = { -- cgit v1.2.3