From f2598a9ca54bb453d983952396265266662b6cf4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Apr 2008 12:36:50 +0000 Subject: [PATCH] * In ssmtp, keep the From line if set explicitly in a mail. svn path=/nixos/trunk/; revision=11706 --- etc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/default.nix b/etc/default.nix index e169b806e31e..3015c34926d1 100644 --- a/etc/default.nix +++ b/etc/default.nix @@ -161,7 +161,8 @@ import ../helpers/make-etc.nix { # Configuration for ssmtp. ++ optional config.networking.defaultMailServer.directDelivery { 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 ""} UseTLS=${if cfg.useTLS then "YES" else "NO"} UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}