Make smarthost transport fully conditional instead of partly

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 431ef22effb28e117f2333623984ffe3a683e9db..e0ac658bf09091de184e32a484c47481f667ba49 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1292,20 +1292,21 @@ end
 out
 %>
 
-remote_smtp_smarthost:
-  debug_print = "T: remote_smtp_smarthost for $local_part@$domain"
-  driver = smtp
 <%=
 out = ""
 if not nodeinfo['smarthost'].empty?
-  out += "  port = " + nodeinfo['smarthost_port'].to_s + "\n"
-end
-
-if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true"
-  out += '  tls_tempfail_tryclear = false
+out = '
+remote_smtp_smarthost:
+  debug_print = "T: remote_smtp_smarthost for $local_part@$domain"
+  driver = smtp
+  port = '
+  out += nodeinfo['smarthost_port'].to_s + "\n"
+  if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true"
+    out += '  tls_tempfail_tryclear = false
   tls_certificate = /etc/exim4/ssl/thishost.crt
   tls_privatekey = /etc/exim4/ssl/thishost.key
 '
+  end
 end
 out
 %>