eximconf: expand comments related to retries

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

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 036f717..ac91dbe 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -179,7 +179,7 @@ gecos_pattern = ^([^,:]*)
 gecos_name = $1
 
 # Do *not* include the body of the original message in a bounce
-# The combinaton of bounce_return_message and bounce_return_body
+# The combination of bounce_return_message and bounce_return_body
 # allows us to return only the headers within a bounce
 
 bounce_return_message = true
@@ -811,11 +811,7 @@ check_recipient:
                      protocol_name=${uc:$received_protocol}\n\
                      instance=${acl_m_grey}\n\
                      helo_name=${sender_helo_name}\n\
-<%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>
-                     client_address=${substr_-3:${mask:$sender_host_address/24}}\n\
-<%- else -%>
                      client_address=${sender_host_address}\n\
-<%- end -%>
                      client_name=${sender_host_name}\n\
                      sender=${sender_address}\n\
                      recipient=$local_part@$domain\n\n
@@ -991,24 +987,15 @@ check_message:
 
 <%- if has_variable?("clamd") && @clamd -%>
   discard condition       = ${if eq {$acl_m_prf}{blackhole}}
-  <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>
-          demime          = *
-  <%- end -%>
           malware         = */defer_ok
           log_message     = discarded malware message for $recipients
 
   deny    condition       = ${if !eq {$acl_m_prf}{markup}}
           condition       = ${if !eq {$acl_m_prf}{PopconMail}}
-  <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>
-         demime          = *
-  <%- end -%>
           malware         = */defer_ok
           message         = malware detected: $malware_name: message rejected
 
   warn    condition       = ${if eq {$acl_m_prf}{markup}}
-  <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>
-         demime          = *
-  <%- end -%>
           malware         = */defer_ok
           message         = X-malware detected: $malware_name
 
@@ -1680,21 +1667,37 @@ rt_pipe:
 #                      RETRY CONFIGURATION                           #
 ######################################################################
 
-# This single retry rule applies to all domains and all errors. It specifies
-# retries every 15 minutes for 2 hours, then increasing retry intervals,
-# starting at 2 hours and increasing each time by a factor of 1.5, up to 16
-# hours, then retries every 8 hours until 4 days have passed since the first
-# failed delivery.
-
 # Domain               Error       Retries
 # ------               -----       -------
 
-
 begin retry
 
+## Note that retry rules specify when an address / host / mail should
+## become eligible for retrying. They do not specify when the retry
+## attempt will actually occur, as this is dependent on queue run
+## frequency and timing.
+
+# For mail to debian.org addresses, this rule starts with
+# retries every 10 minutes for 2 hours, then increasing retry intervals,
+# starting at 2 hours and increasing each time by a factor of 1.5, up to 16
+# hours, then retries every 8 hours until 14 days have passed since the first
+# failed delivery.
 debian.org            *           F,2h,10m; G,16h,2h,1.5; F,14d,8h
+
+# Bounces should get retried every 10 minutes for up to 2 hours
 *                      * senders=: F,2h,10m
+
+# Temporary errors at RCPT TO get retried at 5 minute intervals for
+# 2 hours, then 10 minute intervals for 4 hours, and finally at 15
+# minute intervals for 4 days. This assumes that the cause of the
+# error will get resolved quickly in most cases.
 *                      rcpt_4xx    F,2h,5m;  F,4h,10m; F,4d,15m
+
+# For all remaining mails, addresses and hosts, this rule starts with
+# retries every 15 minutes for 2 hours, then increasing retry intervals,
+# starting at 2 hours and increasing each time by a factor of 1.5, up to 16
+# hours, then retries every 8 hours until 4 days have passed since the first
+# failed delivery.
 *                      *           F,2h,15m; G,16h,2h,1.5; F,4d,8h
 
 # End of Exim 4 configuration