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/juandelacosa.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/juandelacosa.nix')
| -rw-r--r-- | modules/apps/juandelacosa.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/apps/juandelacosa.nix b/modules/apps/juandelacosa.nix index 8df6af0..d417727 100644 --- a/modules/apps/juandelacosa.nix +++ b/modules/apps/juandelacosa.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - inherit (builtins) filter toString; + inherit (builtins) toString; inherit (lib) types mkOption mkEnableOption mkIf hasPrefix concatStrings optionalString; inherit (types) str path int nullOr; @@ -17,8 +17,6 @@ let else " -s '${cfg.socket}'") ]; - keys = filter (f: f != null && hasPrefix "/run/keys/" f) [ cfg.myFile ]; - in { options.nixsap.apps.juandelacosa = { enable = mkEnableOption "Juan de la Cosa"; @@ -51,7 +49,7 @@ in { config = mkIf cfg.enable { nixsap.system.users.daemons = [ cfg.user ]; - nixsap.deployment.keyrings.${cfg.user} = keys; + nixsap.deployment.keyrings.${cfg.user} = [ cfg.myFile ]; systemd.services.juandelacosa = { description = "captain of the MariaDB"; wantedBy = [ "multi-user.target" ]; |