* In ssmtp, keep the From line if set explicitly in a mail.
svn path=/nixos/trunk/; revision=11706
This commit is contained in:
parent
5dbe45bfea
commit
f2598a9ca5
@ -161,7 +161,8 @@ import ../helpers/make-etc.nix {
|
|||||||
# Configuration for ssmtp.
|
# Configuration for ssmtp.
|
||||||
++ optional config.networking.defaultMailServer.directDelivery {
|
++ optional config.networking.defaultMailServer.directDelivery {
|
||||||
source = let cfg = config.networking.defaultMailServer; in pkgs.writeText "ssmtp.conf" ''
|
source = let cfg = config.networking.defaultMailServer; in pkgs.writeText "ssmtp.conf" ''
|
||||||
mailhub=${cfg.hostName}
|
MailHub=${cfg.hostName}
|
||||||
|
FromLineOverride=YES
|
||||||
${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
|
${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
|
||||||
UseTLS=${if cfg.useTLS then "YES" else "NO"}
|
UseTLS=${if cfg.useTLS then "YES" else "NO"}
|
||||||
UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
|
UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user