From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 09:51:44 +0000 (+0200)
Subject: Switch to the hiera optional mail_port
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=43becf6c8c3ff70d73c6a0668a0209cb1092192f

Switch to the hiera optional mail_port
---

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