eximconf: add debug messages for (remaining) transports

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

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 5d2d137..26ac977 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -265,10 +265,15 @@ log_selector = \
                +tls_cipher \
                +tls_peerdn \
                +queue_time \
+               +queue_time_overall \
                +deliver_time \
+               +received_recipients \
+               +unknown_in_list \
                +smtp_connection \
                +smtp_incomplete_transaction \
                +smtp_confirmation \
+               +smtp_syntax_error \
+               +smtp_no_mail \
                +smtp_protocol_error
 
 received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n\t}\
@@ -1075,6 +1080,7 @@ begin routers
 
 <%- if @is_mailrelay -%>
 relay_manualroute:
+  debug_print = "R: relay_manualroute for $local_part@$domain"
   driver = manualroute
   domains = +mailhubdomains
   transport = ${if forany{${lookup dnsdb{>: mxh=$domain}}}\
@@ -1511,6 +1517,7 @@ begin transports
 # directory. (The alternative, which most other unixes use, is to deliver
 # as the user's own group, into a sticky-bitted directory)
 local_delivery:
+  debug_print = "T: local_delivery for $local_part@$domain"
   driver = appendfile
   file = /var/mail/${local_part}
   group = mail
@@ -1527,6 +1534,7 @@ local_delivery:
 # want this to happen only when the pipe fails to complete normally.
 
 address_pipe:
+  debug_print = "T: address_pipe for $local_part@$domain"
   driver = pipe
   current_directory = ${home}
   environment = "EXTENSION=${substr_1:${local_part_suffix}}:\
@@ -1541,10 +1549,12 @@ address_pipe:
 # mentioned elsewhere in this configuration file.
 
 address_file:
+  debug_print = "T: address_file for $local_part@$domain"
   driver = appendfile
   return_path_add
 
 address_file_group:
+  debug_print = "T: address_file_group for $local_part@$domain"
   driver = appendfile
   return_path_add
   mode = 0660
@@ -1567,6 +1577,7 @@ address_file_group:
 # are passed to address_directory.
 
 address_directory:
+  debug_print = "T: address_directory for $local_part@$domain"
   driver = appendfile
   check_string = 
   maildir_format
@@ -1578,11 +1589,13 @@ address_directory:
 # option of the forwardfile director. It has a conventional name, since it
 # is not actually mentioned elsewhere in this configuration file.
 address_reply:
+  debug_print = "T: address_reply for $local_part@$domain"
   driver = autoreply
 
 # This transport is used for delivering messages over SMTP connections.
 
 remote_smtp:
+  debug_print = "T: remote_smtp for $local_part@$domain"
   driver = smtp
   connect_timeout = 15s
   delay_after_cutoff = false
@@ -1590,6 +1603,7 @@ remote_smtp:
   tls_privatekey = /etc/exim4/ssl/thishost.key
 
 remote_smtp_single_domain:
+  debug_print = "T: remote_smtp_single_domain for $local_part@$domain"
   driver = smtp
   connect_timeout = 15s
   delay_after_cutoff = false
@@ -1610,12 +1624,14 @@ remote_smtp_smarthost:
 <%- end -%>
 # Send the message to procmail
 procmail_pipe:
+  debug_print = "T: procmail_pipe for $local_part@$domain"
   driver = pipe
   command = /usr/bin/procmail -a ${substr_1:${local_part_suffix}}
   return_path_add
   user = ${local_part}
 
 bsmtp:
+  debug_print = "T: bsmtp for $local_part@$domain"
   driver = appendfile
   batch_max = 100
   file = ${host}
@@ -1629,6 +1645,7 @@ bsmtp:
 
 <%- if @is_bugsmx -%>
 bugs_pipe:
+  debug_print = "T: bugs_pipe for $local_part@$domain"
   driver = pipe
   command = /srv/bugs.debian.org/mail/run-procmail
   environment = "EXTENSION=${substr_1:${local_part_suffix}}:\