Author: viric
Date: Sun Oct 10 11:08:10 2010
New Revision: 24197
URL: https://svn.nixos.org/websvn/nix/?rev=24197&sc=1
Log:
Requiring nixpkgs 24196, I made nixos set the sendmail path to vixie cron, so
now vixie cron can send mail properly, for example if a user enabled the
'postfix' service.
Modified:
nixos/trunk/modules/services/scheduling/cron.nix
Modified: nixos/trunk/modules/services/scheduling/cron.nix
==============================================================================
--- nixos/trunk/modules/services/scheduling/cron.nix Sun Oct 10 11:07:15
2010 (r24196)
+++ nixos/trunk/modules/services/scheduling/cron.nix Sun Oct 10 11:08:10
2010 (r24197)
@@ -15,6 +15,13 @@
NIX_CONF_DIR=/nix/etc/nix
${pkgs.lib.concatStrings (map (job: job + "\n")
config.services.cron.systemCronJobs)}
'';
+
+ # Vixie cron requires build-time configuration for the sendmail path.
+ cronNixosPkg = pkgs.cron.override {
+ # The mail.nix nixos module, if there is any local mail system enabled,
+ # should have sendmail in this path.
+ sendmailPath = "/var/setuid-wrappers/sendmail";
+ };
in
@@ -65,7 +72,7 @@
mode = "0600"; # Cron requires this.
};
- environment.systemPackages = [pkgs.cron];
+ environment.systemPackages = [ cronNixosPkg ];
jobs.cron =
{ description = "Cron daemon";
@@ -86,7 +93,7 @@
fi
'';
- exec = "${pkgs.cron}/sbin/cron -n";
+ exec = "${cronNixosPkg}/sbin/cron -n";
};
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
