diff options
| -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 2d5281829ed..9589f3c6276 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 c6332ca9f9f..ea1064c2d42 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 28415e89bfa..28415e89bfa 100644 --- a/nixos/doc/manual/configuration/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml |