diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2016-08-29 18:10:38 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-08-29 23:48:12 +0200 |
| commit | dab32a1fa66237acc4ece2d3d4e01e84f4d490dc (patch) | |
| tree | ed1c9411fac5e01453ce704faff314f7ec876376 /nixos | |
| parent | d78e0ed1f98bbeae09d874c748e702da31c9a1b1 (diff) | |
nixos manual: move chapter on grsecurity to auto-generated module docs
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/configuration/configuration.xml | 1 | ||||
| -rw-r--r-- | nixos/modules/security/grsecurity.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/security/grsecurity.xml (renamed from nixos/doc/manual/configuration/grsecurity.xml) | 0 |
3 files changed, 5 insertions, 1 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 2d5281829ed5f..9589f3c6276f2 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -23,7 +23,6 @@ effect after you run <command>nixos-rebuild</command>.</para> <xi:include href="x-windows.xml" /> <xi:include href="networking.xml" /> <xi:include href="linux-kernel.xml" /> -<xi:include href="grsecurity.xml" /> <xi:include href="emacs.xml" /> <xi:include href="modules.xml" xpointer="xpointer(//section[@id='modules']/*)" /> diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index c6332ca9f9f64..ea1064c2d4256 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -20,6 +20,11 @@ let in { + meta = { + maintainers = with maintainers; [ joachifm ]; + doc = ./grsecurity.xml; + }; + options.security.grsecurity = { enable = mkEnableOption "grsecurity/PaX"; diff --git a/nixos/doc/manual/configuration/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 28415e89bfab6..28415e89bfab6 100644 --- a/nixos/doc/manual/configuration/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml |