diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-12-30 18:32:05 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-12-30 18:32:05 +0100 |
| commit | adf62ba9c17285a498467e83a19243e52dfc36d3 (patch) | |
| tree | 78dad592f45555d946c8665c21e74457a1bd56f1 | |
| parent | c502369a23244b9cd6b61733a14410c99a3d2701 (diff) | |
| download | nixlib-adf62ba9c17285a498467e83a19243e52dfc36d3.tar nixlib-adf62ba9c17285a498467e83a19243e52dfc36d3.tar.gz nixlib-adf62ba9c17285a498467e83a19243e52dfc36d3.tar.bz2 nixlib-adf62ba9c17285a498467e83a19243e52dfc36d3.tar.lz nixlib-adf62ba9c17285a498467e83a19243e52dfc36d3.tar.xz nixlib-adf62ba9c17285a498467e83a19243e52dfc36d3.tar.zst nixlib-adf62ba9c17285a498467e83a19243e52dfc36d3.zip | |
Drop reference to obsolete ControlGroupAttribute option
| -rw-r--r-- | nixos/doc/manual/administration/control-groups.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml index 86c684cdfe5d..0d7b8ae910a7 100644 --- a/nixos/doc/manual/administration/control-groups.xml +++ b/nixos/doc/manual/administration/control-groups.xml @@ -58,12 +58,10 @@ controls memory allocation limits; by default, all processes are in the top-level cgroup, so any service or session can exhaust all available memory. Per-cgroup memory limits can be specified in <filename>configuration.nix</filename>; for instance, to limit -<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap) -and 640 MiB of RAM (including swap): +<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap): <programlisting> systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; -systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ]; </programlisting> </para> @@ -72,4 +70,4 @@ systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.lim continuously updated list of all cgroups with their CPU and memory usage.</para> -</chapter> \ No newline at end of file +</chapter> |