Switch to the hiera optional mail_port

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index d7648fc..5aea958 100644 (file)
--- 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