diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2019-04-29 12:36:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-29 12:36:24 +0000 |
| commit | b2a165e7862d3e633f13fdf4275b8eb201b1ba8e (patch) | |
| tree | 94612aa2404dc08e9e514681a3f49f393f72da93 /nixos | |
| parent | aeb464dfd3724e013eb5c6a1bc82b1101d1306ce (diff) | |
| parent | aa24c4e95b54acb8bcd526ee04afb5492808457c (diff) | |
| download | nixpkgs-b2a165e7862d3e633f13fdf4275b8eb201b1ba8e.tar nixpkgs-b2a165e7862d3e633f13fdf4275b8eb201b1ba8e.tar.gz nixpkgs-b2a165e7862d3e633f13fdf4275b8eb201b1ba8e.tar.bz2 nixpkgs-b2a165e7862d3e633f13fdf4275b8eb201b1ba8e.tar.lz nixpkgs-b2a165e7862d3e633f13fdf4275b8eb201b1ba8e.tar.xz nixpkgs-b2a165e7862d3e633f13fdf4275b8eb201b1ba8e.tar.zst nixpkgs-b2a165e7862d3e633f13fdf4275b8eb201b1ba8e.zip | |
Merge pull request #60377 from joachifm/feat/apparmor-systemd
nixos/apparmor: service unit improvements
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/security/apparmor.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index d323a158a4d..4512a7a80f6 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -33,7 +33,12 @@ in paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d") ([ pkgs.apparmor-profiles ] ++ cfg.packages); in { - wantedBy = [ "local-fs.target" ]; + after = [ "local-fs.target" ]; + before = [ "sysinit.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + DefaultDependencies = "no"; + }; serviceConfig = { Type = "oneshot"; RemainAfterExit = "yes"; @@ -43,6 +48,9 @@ in ExecStop = map (p: ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}"'' ) cfg.profiles; + ExecReload = map (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser --reload ${paths} "${p}"'' + ) cfg.profiles; }; }; }; |