JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33227 from Ekleog/fcron-opensmtpd

Browse Source 
fcron module: be compatible with non-wrapped sendmail's, like opensmt…
This commit is contained in:
Jörg Thalheim 2018-01-02 09:26:53 +01:00 committed by GitHub
commit 54b16bcd11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/scheduling/fcron.nix
View File

@ -90,14 +90,22 @@ in
[ (allowdeny "allow" (cfg.allow)) [ (allowdeny "allow" (cfg.allow))
(allowdeny "deny" cfg.deny) (allowdeny "deny" cfg.deny)
# see man 5 fcron.conf # see man 5 fcron.conf
{ source = pkgs.writeText "fcron.conf" '' { source =
let
isSendmailWrapped =
lib.hasAttr "sendmail" config.security.wrappers;
sendmailPath =
if isSendmailWrapped then "/run/wrappers/bin/sendmail"
else "${config.system.path}/bin/sendmail";
in
pkgs.writeText "fcron.conf" ''
fcrontabs = /var/spool/fcron fcrontabs = /var/spool/fcron
pidfile = /var/run/fcron.pid pidfile = /var/run/fcron.pid
fifofile = /var/run/fcron.fifo fifofile = /var/run/fcron.fifo
fcronallow = /etc/fcron.allow fcronallow = /etc/fcron.allow
fcrondeny = /etc/fcron.deny fcrondeny = /etc/fcron.deny
shell = /bin/sh shell = /bin/sh
sendmail = /run/wrappers/bin/sendmail sendmail = ${sendmailPath}
editor = ${pkgs.vim}/bin/vim editor = ${pkgs.vim}/bin/vim
''; '';
target = "fcron.conf"; target = "fcron.conf";