diff options
| author | Florian Klink <flokli@flokli.de> | 2019-11-08 15:37:30 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2019-11-08 15:38:06 +0100 |
| commit | 6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0 (patch) | |
| tree | 26af84ff75cecaec75740136da98cd6ce0bb9395 /nixos/modules/services/databases/redis.nix | |
| parent | a2429cffa3451f3d5c8e80a295663fef0a96bd9b (diff) | |
| download | nixpkgs-6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0.tar nixpkgs-6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0.tar.gz nixpkgs-6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0.tar.bz2 nixpkgs-6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0.tar.lz nixpkgs-6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0.tar.xz nixpkgs-6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0.tar.zst nixpkgs-6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0.zip | |
nixos/redis: fix merging
https://github.com/NixOS/nixpkgs/pull/71584 did merging without mkMerge. cc @jtojnar
Diffstat (limited to 'nixos/modules/services/databases/redis.nix')
| -rw-r--r-- | nixos/modules/services/databases/redis.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 5695eeaf74c..95128a641d9 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -185,10 +185,10 @@ in ###### implementation config = mkIf config.services.redis.enable { - - boot.kernel.sysctl = { - "vm.nr_hugepages" = "0"; - } // mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; }; + boot.kernel.sysctl = (mkMerge [ + { "vm.nr_hugepages" = "0"; } + ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } ) + ]); networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; |