Merge pull request #73049 from flokli/fix-redis-merge
nixos/redis: fix merging
This commit is contained in:
commit
cced569cac
@ -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 ];
|
||||
|
Loading…
x
Reference in New Issue
Block a user