Remove smarthost_port from nodeinfo

[mirror/dsa-puppet.git] / modules / exim / templates / eximconf.erb

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index bea1faa..c8be351 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -229,7 +229,7 @@ if not scope.lookupvar('deprecated::nodeinfo')['mail_port'].to_s.empty?
 end
 
 if @is_mailrelay
-  ports << scope.lookupvar('deprecated::nodeinfo')['smarthost_port']
+  ports << @smarthost_port
 end
 
 out += ports.uniq.sort.join(" : ")
@@ -1577,24 +1577,17 @@ remote_smtp:
   tls_certificate = /etc/exim4/ssl/thishost.crt
   tls_privatekey = /etc/exim4/ssl/thishost.key
 
-<%=
-out = ""
-if not scope.lookupvar('deprecated::nodeinfo')['smarthost'].empty?
-out = '
+<%- if not scope.lookupvar('deprecated::nodeinfo')['smarthost'].empty? -%>
 remote_smtp_smarthost:
   debug_print = "T: remote_smtp_smarthost for $local_part@$domain"
   driver = smtp
   delay_after_cutoff = false
-  port = '
-  out += scope.lookupvar('deprecated::nodeinfo')['smarthost_port'].to_s + "\n"
-  out += '  tls_tempfail_tryclear = false
+  port = <%= @marthost_port -%>
+  tls_tempfail_tryclear = false
   hosts_require_tls = ' + scope.lookupvar('deprecated::nodeinfo')['smarthost'] + '
   tls_certificate = /etc/exim4/ssl/thishost.crt
   tls_privatekey = /etc/exim4/ssl/thishost.key
-'
-end
-out
-%>
+<%- end -%>
 # Send the message to procmail
 procmail_pipe:
   driver = pipe