Skip to content
Permalink
Browse files

nixos/redis: fix merging

#71584 did merging without mkMerge.

cc @jtojnar

(cherry picked from commit 6303131)
  • Loading branch information...
flokli committed Nov 8, 2019
1 parent f074604 commit 107e2b7b29fdb7962364c2a75c080fa07d2d5355
Showing with 4 additions and 4 deletions.
  1. +4 −4 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 ];

0 comments on commit 107e2b7

Please sign in to comment.
You can’t perform that action at this time.