diff options
author | Malte Brandy <malte.brandy@maralorn.de> | 2019-10-21 22:36:27 +0200 |
---|---|---|
committer | Malte Brandy <malte.brandy@maralorn.de> | 2019-10-21 22:38:16 +0200 |
commit | fe143bac5b8dbdbdc9332abc3f2acdf839652c9e (patch) | |
tree | 3fca48689912f8c9abc61db75b9acf57dda35d93 /nixos | |
parent | 2695914175575e9ad8ae9a602a9c9668ff6e24d5 (diff) | |
download | nixpkgs-fe143bac5b8dbdbdc9332abc3f2acdf839652c9e.tar nixpkgs-fe143bac5b8dbdbdc9332abc3f2acdf839652c9e.tar.gz nixpkgs-fe143bac5b8dbdbdc9332abc3f2acdf839652c9e.tar.bz2 nixpkgs-fe143bac5b8dbdbdc9332abc3f2acdf839652c9e.tar.lz nixpkgs-fe143bac5b8dbdbdc9332abc3f2acdf839652c9e.tar.xz nixpkgs-fe143bac5b8dbdbdc9332abc3f2acdf839652c9e.tar.zst nixpkgs-fe143bac5b8dbdbdc9332abc3f2acdf839652c9e.zip |
nixos/redis: Disable hugepages for redis via sysctl and not via a systemd-oneshot
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/databases/redis.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 9c389d80a6d..5861323e5ea 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -186,9 +186,9 @@ in config = mkIf config.services.redis.enable { - boot.kernel.sysctl = mkIf cfg.vmOverCommit { - "vm.overcommit_memory" = "1"; - }; + boot.kernel.sysctl = { + "vm.nr_hugepages" = "0"; + } // mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; }; networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; @@ -198,14 +198,6 @@ in environment.systemPackages = [ cfg.package ]; - systemd.services.disable-transparent-huge-pages = { - description = "Disable Transparent Huge Pages (required by Redis)"; - before = [ "redis.service" ]; - wantedBy = [ "redis.service" ]; - script = "echo never > /sys/kernel/mm/transparent_hugepage/enabled"; - serviceConfig.Type = "oneshot"; - }; - systemd.services.redis = { description = "Redis Server"; |