diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-02-23 17:48:39 -0500 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-04-13 07:00:56 -0400 |
commit | 7808202b388a41e39504a5fc29b5b9e2b5eea20f (patch) | |
tree | 1a8a19776333f4804ace3659574d7da57cdc9300 /nixos/modules/services/security/munge.nix | |
parent | 919c87a10643ea317dc942329d0b7ee47507e6dc (diff) | |
download | nixpkgs-7808202b388a41e39504a5fc29b5b9e2b5eea20f.tar nixpkgs-7808202b388a41e39504a5fc29b5b9e2b5eea20f.tar.gz nixpkgs-7808202b388a41e39504a5fc29b5b9e2b5eea20f.tar.bz2 nixpkgs-7808202b388a41e39504a5fc29b5b9e2b5eea20f.tar.lz nixpkgs-7808202b388a41e39504a5fc29b5b9e2b5eea20f.tar.xz nixpkgs-7808202b388a41e39504a5fc29b5b9e2b5eea20f.tar.zst nixpkgs-7808202b388a41e39504a5fc29b5b9e2b5eea20f.zip |
nixos/munge: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules/services/security/munge.nix')
-rw-r--r-- | nixos/modules/services/security/munge.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix index 504bc66c6d1..1c4f8e20552 100644 --- a/nixos/modules/services/security/munge.nix +++ b/nixos/modules/services/security/munge.nix @@ -49,21 +49,16 @@ in path = [ pkgs.munge pkgs.coreutils ]; - preStart = '' - chmod 0400 ${cfg.password} - mkdir -p /var/lib/munge -m 0711 - chown -R munge:munge /var/lib/munge - mkdir -p /run/munge -m 0755 - chown -R munge:munge /run/munge - ''; - serviceConfig = { + ExecStartPre = "+${pkgs.coreutils}/bin/chmod 0400 ${cfg.password}"; ExecStart = "${pkgs.munge}/bin/munged --syslog --key-file ${cfg.password}"; PIDFile = "/run/munge/munged.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - PermissionsStartOnly = "true"; User = "munge"; Group = "munge"; + StateDirectory = "munge"; + StateDirectoryMode = "0711"; + RuntimeDirectory = "munge"; }; }; |