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/mariadb | |
| 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/mariadb')
| -rw-r--r-- | modules/apps/mariadb/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/apps/mariadb/default.nix b/modules/apps/mariadb/default.nix index cdf5d92..4574be6 100644 --- a/modules/apps/mariadb/default.nix +++ b/modules/apps/mariadb/default.nix @@ -255,16 +255,14 @@ let } ''; - all-keys = unique (filter (f: f != null && hasPrefix "/run/keys/" f ) (flatten ( + all-keys = flatten ( mapAttrsToList (ch: {master, mysqldump, ...}: [ master.password-file master.ssl-key mysqldump.password-file mysqldump.ssl-key ]) (explicit cfg.replicate) - ) ++ [ - cfg.mysqld.ssl_key - ])); + ) ++ [ cfg.mysqld.ssl_key ]; in { |