diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 04:11:01 -0600 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 04:11:01 -0600 |
| commit | 4aa0923009dac4d2307b5fe018b944180bfad6a2 (patch) | |
| tree | f3a9ae5ddb0d772936dd1d53534fbe677e67a838 /nixos/modules/services/scheduling | |
| parent | a8cb2afa981099889cf47185be33f4a831ff482b (diff) | |
| download | nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.gz nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.bz2 nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.lz nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.xz nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.zst nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.zip | |
Getting rid of the var indirection and using a bin path instead
Diffstat (limited to 'nixos/modules/services/scheduling')
| -rw-r--r-- | nixos/modules/services/scheduling/atd.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/scheduling/cron.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/scheduling/fcron.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 7b4937b5c673..f3ada6b7496a 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -42,13 +42,13 @@ in config = mkIf cfg.enable { - security.wrappers.setuid = map (program: "${program}" = { + security.wrappers = map (program: {"${program}" = { source = "${pkgs.atd}/bin/${program}"; owner = "atd"; group = "atd"; setuid = true; setgid = true; - }) [ "at" "atq" "atrm" "batch" ]; + };}) [ "at" "atq" "atrm" "batch" ]; environment.systemPackages = [ at ]; diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index 7bd1e4818048..48c5f6be3168 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -20,7 +20,7 @@ let cronNixosPkg = pkgs.cron.override { # The mail.nix nixos module, if there is any local mail system enabled, # should have sendmail in this path. - sendmailPath = "/run/wrappers/sendmail"; + sendmailPath = "/run/wrappers/bin/sendmail"; }; allFiles = diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index f0de996224ff..339b0de66e98 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -96,7 +96,7 @@ in fcronallow = /etc/fcron.allow fcrondeny = /etc/fcron.deny shell = /bin/sh - sendmail = /run/wrappers/sendmail + sendmail = /run/wrappers/bin/sendmail editor = /run/current-system/sw/bin/vi ''; target = "fcron.conf"; |