Merge pull request #7149 from joachifm/grsec-gradm-optional

grsecurity module: configure gradm iff RBAC is enabled
This commit is contained in:
Austin Seipp 2015-04-13 17:11:29 -05:00
commit 8d3b8d0dc8

View File

@ -276,22 +276,21 @@ in
# }; # };
# }; # };
system.activationScripts.grsec = system.activationScripts = lib.optionalAttrs (!cfg.config.disableRBAC) { grsec = ''
'' mkdir -p /etc/grsec
mkdir -p /etc/grsec if [ ! -f /etc/grsec/learn_config ]; then
if [ ! -f /etc/grsec/learn_config ]; then cp ${pkgs.gradm}/etc/grsec/learn_config /etc/grsec
cp ${pkgs.gradm}/etc/grsec/learn_config /etc/grsec fi
fi if [ ! -f /etc/grsec/policy ]; then
if [ ! -f /etc/grsec/policy ]; then cp ${pkgs.gradm}/etc/grsec/policy /etc/grsec
cp ${pkgs.gradm}/etc/grsec/policy /etc/grsec fi
fi chmod -R 0600 /etc/grsec
chmod -R 0600 /etc/grsec ''; };
'';
# Enable AppArmor, gradm udev rules, and utilities # Enable AppArmor, gradm udev rules, and utilities
security.apparmor.enable = true; security.apparmor.enable = true;
boot.kernelPackages = customGrsecPkg; boot.kernelPackages = customGrsecPkg;
services.udev.packages = [ pkgs.gradm ]; services.udev.packages = lib.optional (!cfg.config.disableRBAC) pkgs.gradm;
environment.systemPackages = [ pkgs.gradm pkgs.paxctl pkgs.pax-utils ]; environment.systemPackages = [ pkgs.paxctl pkgs.pax-utils ] ++ lib.optional (!cfg.config.disableRBAC) pkgs.gradm;
}; };
} }