X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=1ed7e0bb2163ad3a342ad1a58b02d5e467a91a89;hb=85e69a1445c82de137d48da44ed9f30ab643d209;hp=9b89ea11343087ffbef5d14f4f872c4085d20c71;hpb=f26d701aaead086614b9d335e1b9ade03d5ea807;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 9b89ea113..1ed7e0bb2 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -119,7 +119,7 @@ domainlist mailhubdomains = lsearch;/etc/exim4/manualroute
 hostlist reservedaddrs = <%= nodeinfo['reservedaddrs'] %>
 
 <%= out = ""
-if has_variable?("exim_ssl_certs") && exim_ssl_certs == true
+if exim_ssl_certs
 out = "tls_certificate = /etc/exim4/ssl/thishost.crt
 tls_privatekey = /etc/exim4/ssl/thishost.key
 tls_try_verify_hosts = *
@@ -190,16 +190,16 @@ ports = []
 out = "daemon_smtp_ports = "
 ports << 25
 
-if results['bugsmaster']
+if nodeinfo['bugsmaster']
   ports << 587
 end
 
-if not results['mail_port'].empty?
-  ports << results['mail_port']
+if not nodeinfo['mail_port'].empty?
+  ports << nodeinfo['mail_port']
 end
 
-if results['mailrelay']
-  ports << results['smarthost_port']
+if nodeinfo['mailrelay']
+  ports << nodeinfo['smarthost_port']
 end
 
 out += ports.uniq.sort.join(" : ")
@@ -254,7 +254,7 @@ check_helo:
 
 <%= 
 out = ""
-if results['mailrelay']
+if nodeinfo['mailrelay']
   out = "  accept  verify   = certificate"
 end
 out
@@ -347,7 +347,7 @@ check_submission:
 
 <%= 
 out = ""
-if results['mailrelay']
+if nodeinfo['mailrelay']
   out = "  accept  verify   = certificate"
 end
 out
@@ -388,7 +388,7 @@ check_recipient:
 
 <%= 
 out = ""
-if results['mailrelay']
+if nodeinfo['mailrelay']
   out = "  accept  verify   = certificate"
 end
 out
@@ -643,6 +643,7 @@ elsif has_variable?("postgrey") && postgrey == "true"
     condition      = ${if eq{${uc:${substr_0_7:$acl_m3}}}{PREPEND}}
     message        = ${sg{$acl_m3}{^\\w+\\s*}{}}
 '
+end
 out
 %>
 
@@ -809,7 +810,7 @@ begin routers
 
 <%=
 out = ""
-if results['mailrelay']
+if nodeinfo['mailrelay']
   out = '
 relay_manualroute:
   driver = manualroute
@@ -844,7 +845,7 @@ ipliteral:
 
 <%=
 out = ""
-if not results['smarthost'].empty?
+if not nodeinfo['smarthost'].empty?
 out = '
 smarthost:
   debug_print = "R: smarthost for $local_part@$domain"
@@ -1010,7 +1011,7 @@ localuser:
 # the virts, and delivering to them.  blah.
 <%=
 out = ""
-if results['packagesmaster']
+if nodeinfo['packagesmaster']
   out = '
 # This router delivers for packages.d.o
 packages:
@@ -1034,7 +1035,7 @@ out
 
 <%=
 out = ""
-if results['bugsmaster']
+if nodeinfo['bugsmaster']
   out = '
 # This router delivers for bugs.d.o
 bugs:
@@ -1057,7 +1058,7 @@ out
 
 <%=
 out = ""
-if results['rtmaster']
+if nodeinfo['rtmaster']
   out = '
 # This router delivers for rt.d.o
 rt_force_new_verbose:
@@ -1075,7 +1076,7 @@ rt_force_new_verbose:
 # - rt+NNNN@rt.debian.org          : attach correspondence to ticket (verbose)
 # - rt+NNNN-quiesce@rt.debian.org  : attach correspondence to ticket (quiesce)
 # - rt+NNNN-<action>@rt.debian.org : attach correspondence to ticket (some action)
-# requires modification to custom condition in 'scrips'
+# requires modification to custom condition in \'scrips\'
 rt_force_new_quiesce:
   debug_print = "R: rt for $local_part+new-quiesce@$domain"
   driver = redirect
@@ -1296,8 +1297,8 @@ remote_smtp_smarthost:
   driver = smtp
 <%=
 out = ""
-if not results['smarthost'].empty?
-  out += "  port = " + results['smarthost_port'] + "\n"
+if not nodeinfo['smarthost'].empty?
+  out += "  port = " + nodeinfo['smarthost_port'] + "\n"
 end
 
 if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true"
@@ -1330,7 +1331,7 @@ bsmtp:
 
 <%=
 out = ""
-if results['bugsmaster']
+if nodeinfo['bugsmaster']
   out = '
 bugs_pipe:
   driver = pipe
@@ -1349,7 +1350,7 @@ out
 
 <%=
 out = ""
-if results['rtmaster']
+if nodeinfo['rtmaster']
   out = '
 rt_pipe:
   debug_print = "T: rt_pipe for $local_part${local_part_suffix}@$domain"