diff options
| author | Florian Klink <flokli@flokli.de> | 2019-11-08 22:13:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 22:13:54 +0100 |
| commit | cced569cac796a0e008033fe3aef1b3e4bbedaf0 (patch) | |
| tree | aa0487a80451d2b6d8d5cdbb9be4bca08a6c49d8 /nixos | |
| parent | 1d3da3befcda7ba36546e30ad1e4bf609b24e5c2 (diff) | |
| parent | 6303131eb9a1f1e02312a9af3b7d77f6f4f9fcd0 (diff) | |
| download | nixlib-cced569cac796a0e008033fe3aef1b3e4bbedaf0.tar nixlib-cced569cac796a0e008033fe3aef1b3e4bbedaf0.tar.gz nixlib-cced569cac796a0e008033fe3aef1b3e4bbedaf0.tar.bz2 nixlib-cced569cac796a0e008033fe3aef1b3e4bbedaf0.tar.lz nixlib-cced569cac796a0e008033fe3aef1b3e4bbedaf0.tar.xz nixlib-cced569cac796a0e008033fe3aef1b3e4bbedaf0.tar.zst nixlib-cced569cac796a0e008033fe3aef1b3e4bbedaf0.zip | |
Merge pull request #73049 from flokli/fix-redis-merge
nixos/redis: fix merging
Diffstat (limited to 'nixos')
| -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 5695eeaf74cb..95128a641d94 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 ]; |