diff options
author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-26 00:05:40 -0800 |
---|---|---|
committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-26 00:05:40 -0800 |
commit | 025555d7f1a0fc39ea152b03e942002e1bff1721 (patch) | |
tree | 82f3d014c8848ecc9f6f26958c9f99f83da0bc65 /nixos/modules/services/networking/smokeping.nix | |
parent | bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e (diff) | |
download | nixpkgs-025555d7f1a0fc39ea152b03e942002e1bff1721.tar nixpkgs-025555d7f1a0fc39ea152b03e942002e1bff1721.tar.gz nixpkgs-025555d7f1a0fc39ea152b03e942002e1bff1721.tar.bz2 nixpkgs-025555d7f1a0fc39ea152b03e942002e1bff1721.tar.lz nixpkgs-025555d7f1a0fc39ea152b03e942002e1bff1721.tar.xz nixpkgs-025555d7f1a0fc39ea152b03e942002e1bff1721.tar.zst nixpkgs-025555d7f1a0fc39ea152b03e942002e1bff1721.zip |
More fixes and improvements
Diffstat (limited to 'nixos/modules/services/networking/smokeping.nix')
-rw-r--r-- | nixos/modules/services/networking/smokeping.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 04312c39062..6d2f5f8d41f 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.wrapperDir}/fping + binary = ${config.security.permissionsWrapperDir}/fping ''; description = "Probe configuration"; }; sendmail = mkOption { type = types.nullOr types.path; default = null; - example = "/var/setuid-wrappers/sendmail"; + example = "/var/permissions-wrappers/sendmail"; description = "Use this sendmail compatible script to deliver alerts"; }; smokeMailTemplate = mkOption { @@ -273,7 +273,14 @@ in message = "services.smokeping: sendmail and Mailhost cannot both be enabled."; } ]; - security.setuidPrograms = [ "fping" ]; + security.permissionsWrappers.setuid = [ + { program = "fping"; + source = "${e.enlightenment.out}/bin/fping"; + owner = "root"; + group = "root"; + setuid = true; + } + ]; environment.systemPackages = [ pkgs.fping ]; users.extraUsers = singleton { name = cfg.user; |