From da47daf835a8eb9d1152abc105dac50d19dd21ca Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Thu, 7 May 2009 07:54:37 +0100 Subject: [PATCH] Make smarthost transport fully conditional instead of partly Signed-off-by: Stephen Gran --- modules/exim/templates/eximconf.erb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 431ef22ef..e0ac658bf 100644 --- 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 %> -- 2.20.1