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

nixos/postfix: support alternate smtp ports when relaying (#30685)

Browse Source 
* postfix: support alternate smtp ports when relaying

* fix missing ; after merge
This commit is contained in:
Sarah Brofeldt 2017-11-01 19:06:27 +01:00 committed by Joachim Schiele
parent e1cd08e1c7
commit 2ddcdcce26
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nixos/modules/services/mail/postfix.nix
View File

@ -60,11 +60,11 @@ let
manpage_directory = "${pkgs.postfix}/share/man";
html_directory = "${pkgs.postfix}/share/postfix/doc/html";
shlib_directory = false;
relayhost = if cfg.lookupMX || cfg.relayHost == ""
then cfg.relayHost
else
"[${cfg.relayHost}]"
+ optionalString (cfg.relayPort != null) ":${toString cfg.relayPort}";
relayhost = if cfg.relayHost == "" then "" else
if cfg.lookupMX
then "${cfg.relayHost}:${toString cfg.relayPort}"
else "[${cfg.relayHost}]:${toString cfg.relayPort}";
mail_spool_directory = "/var/spool/mail/";
setgid_group = setgidGroup;
}
@ -461,13 +461,10 @@ in
};
relayPort = mkOption {
type = types.nullOr types.int;
default = null;
example = 587;
type = types.int;
default = 25;
description = "
Specify an optional port for outbound mail relay. (Note:
only used if an explicit <option>relayHost</option> is
defined.)
SMTP port for relay mail relay.
";
};