From 43becf6c8c3ff70d73c6a0668a0209cb1092192f Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 22 Sep 2019 11:51:44 +0200 Subject: [PATCH] Switch to the hiera optional mail_port --- modules/exim/templates/eximconf.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index d7648fc01..5aea95878 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -219,15 +219,14 @@ av_scanner = clamd:/var/run/clamav/clamd.ctl ports = [] out = "daemon_smtp_ports = " ports << 25 +if @mail_port # if we have an overridden mail_port + ports << @mail_port +end if @is_bugsmx ports << 587 end -if not scope.lookupvar('deprecated::nodeinfo')['mail_port'].to_s.empty? - ports << scope.lookupvar('deprecated::nodeinfo')['mail_port'] -end - if @is_mailrelay ports << @smarthost_port end -- 2.20.1