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/sproxy-web.nix | |
| 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/sproxy-web.nix')
| -rw-r--r-- | modules/apps/sproxy-web.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/apps/sproxy-web.nix b/modules/apps/sproxy-web.nix index 351e82d..04ddcdf 100644 --- a/modules/apps/sproxy-web.nix +++ b/modules/apps/sproxy-web.nix @@ -4,7 +4,7 @@ let inherit (builtins) toString ; inherit (lib) - concatStrings filter hasPrefix mkEnableOption mkIf mkOption + concatStrings hasPrefix mkEnableOption mkIf mkOption optionalString types ; inherit (types) int nullOr path str ; @@ -19,8 +19,6 @@ let else " -s '${cfg.socket}'") ]; - keys = filter (f: f != null && hasPrefix "/run/keys/" f) [ cfg.pgPassFile ]; - in { options.nixsap.apps.sproxy-web = { enable = mkEnableOption "Sproxy Web"; @@ -53,7 +51,7 @@ in { config = mkIf cfg.enable { nixsap.system.users.daemons = [ cfg.user ]; - nixsap.deployment.keyrings.${cfg.user} = keys; + nixsap.deployment.keyrings.${cfg.user} = [ cfg.pgPassFile ]; systemd.services.sproxy-web = { description = "Web interface to Sproxy database"; wantedBy = [ "multi-user.target" ]; |