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

* 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

View file

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