From: Adam D. Barratt Date: Sat, 28 Sep 2019 14:14:56 +0000 (+0100) Subject: eximconf: drop jessie-specific configuration X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0ed39125857e444effa6ee1178f1afe6f2642ca3;p=mirror%2Fdsa-puppet.git eximconf: drop jessie-specific configuration Signed-off-by: Adam D. Barratt --- diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 036f7177f..953548da1 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -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