diff options
author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-28 20:48:03 -0800 |
---|---|---|
committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-28 20:48:03 -0800 |
commit | e92b8402b05f34072a20075ed54660e7a7237cc3 (patch) | |
tree | 554ae0ff77ff4192a895bab155e5e7116c80f28d /nixos/modules/services/networking/smokeping.nix | |
parent | 9de070e620544f9637b20966eec62cbff42988d8 (diff) | |
download | nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.gz nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.bz2 nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.lz nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.xz nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.zst nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.zip |
Addressing PR feedback
Diffstat (limited to 'nixos/modules/services/networking/smokeping.nix')
-rw-r--r-- | nixos/modules/services/networking/smokeping.nix | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 67aa313c8605..b7bb55f55084 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -219,14 +219,14 @@ in type = types.string; default = '' + FPing - binary = ${config.security.permissionsWrapperDir}/fping + binary = ${config.security.wrapperDir}/fping ''; description = "Probe configuration"; }; sendmail = mkOption { type = types.nullOr types.path; default = null; - example = "/var/permissions-wrappers/sendmail"; + example = "/run/wrappers/sendmail"; description = "Use this sendmail compatible script to deliver alerts"; }; smokeMailTemplate = mkOption { @@ -273,21 +273,7 @@ in message = "services.smokeping: sendmail and Mailhost cannot both be enabled."; } ]; - security.permissionsWrappers.setuid = [ - { program = "fping"; - source = "${pkgs.fping}/bin/fping"; - owner = "root"; - group = "root"; - setuid = true; - } - - { program = "fping"; - source = "${pkgs.fping}/bin/fping6"; - owner = "root"; - group = "root"; - setuid = true; - } - ]; + security.setuidPrograms = [ "fping" "fping6" ]; environment.systemPackages = [ pkgs.fping ]; users.extraUsers = singleton { name = cfg.user; |