diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-29 12:01:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-29 12:01:15 +0000 |
commit | 6fecc628f91a59edecd5775881e14944d98084c6 (patch) | |
tree | ba797b25a77f9ba4af7243b1ef261452d434f5b7 /nixos/modules/services/databases | |
parent | ad6f6ba3998c1f28efbdf6358362edcc585722ba (diff) | |
parent | 8cf34f783f4fa154880c53c8e17397a6560ece93 (diff) |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/databases')
-rw-r--r-- | nixos/modules/services/databases/redis.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 1da2fa9f1160..ad88a4f589a2 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -57,9 +57,9 @@ in { package = mkPackageOption pkgs "redis" { }; vmOverCommit = mkEnableOption '' - setting of vm.overcommit_memory to 1 + set `vm.overcommit_memory` sysctl to 1 (Suggested for Background Saving: <https://redis.io/docs/get-started/faq/>) - ''; + '' // { default = true; }; servers = mkOption { type = with types; attrsOf (submodule ({ config, name, ... }: { @@ -312,10 +312,9 @@ in { ''; }) enabledServers); - boot.kernel.sysctl = mkMerge [ - { "vm.nr_hugepages" = "0"; } - ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } ) - ]; + boot.kernel.sysctl = mkIf cfg.vmOverCommit { + "vm.overcommit_memory" = "1"; + }; networking.firewall.allowedTCPPorts = concatMap (conf: optional conf.openFirewall conf.port |