aboutsummaryrefslogtreecommitdiff
path: root/nixos/modules/services/scheduling
diff options
context:
space:
mode:
authorParnell Springmeyer <parnell@digitalmentat.com>2017-01-29 04:11:01 -0600
committerParnell Springmeyer <parnell@digitalmentat.com>2017-01-29 04:11:01 -0600
commit4aa0923009dac4d2307b5fe018b944180bfad6a2 (patch)
treef3a9ae5ddb0d772936dd1d53534fbe677e67a838 /nixos/modules/services/scheduling
parenta8cb2afa981099889cf47185be33f4a831ff482b (diff)
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.nix4
-rw-r--r--nixos/modules/services/scheduling/cron.nix2
-rw-r--r--nixos/modules/services/scheduling/fcron.nix2
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 7b4937b5c67..f3ada6b7496 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 7bd1e481804..48c5f6be316 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 f0de996224f..339b0de66e9 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";