Amavis: use the LMTP protocol in the policy banks.

1 files changed, 2 insertions, 0 deletions

diff --git a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2 b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
index 92805b8..7d0302a 100644
--- a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
+++ b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
@@ -119,66 +119,68 @@ $sa_quarantine_cutoff_level = undef;
 
 # Here is an overall picture (sequence of events) of how pieces fit together
 #
 #   bypass_virus_checks set for all recipients? ==> PASS
 #   no viruses?   ==> PASS
 #   log virus     if $log_templ is nonempty
 #   quarantine    if $virus_quarantine_to is nonempty
 #   notify admin  if $virus_admin (lookup) nonempty
 #   notify recips if $warnvirusrecip and (recipient is local or $warn_offsite)
 #   add address extensions for local recipients (when enabled)
 #   send (non-)delivery notifications
 #      to sender if DSN needed (BOUNCE or ($warnvirussender and D_PASS))
 #   virus_lovers or final_destiny==D_PASS  ==> PASS
 #   DISCARD (2xx) or REJECT (5xx) (depending on final_*_destiny)
 
 
 # Mandatory DKIM signing and virus checking only
 $policy_bank{'OUTGOING'} = {
   originating              => 1,
   enable_dkim_verification => 0,
+  protocol                 => 'LMTP',
   smtpd_greeting_banner    => '${helo-name} ${protocol} ${product} OUTGOING service ready',
   forward_method           => $forward_method,
 
   # No black or white lists
   message_size_limit_maps => [],
   whitelist_sender_maps   => [],
   blacklist_sender_maps   => [],
 
   # Check for viruses (regardless of the recipient), but bypass all other checks
   bypass_virus_checks_maps  => undef,
   bypass_banned_checks_maps => 1,
   bypass_header_checks_maps => 1,
   bypass_spam_checks_maps   => 1,
 
   # If a virus is found, notify postmaster, quarantine, then discard.
   # Treat unchecked mails (eg, encrypted) as clean.
   quarantine_to_maps_by_ccat => { &CC_VIRUS => [$virus_quarantine_to],     &CC_UNCHECKED => undef, &CC_CLEAN => undef       },
   quarantine_method_by_ccat  => { &CC_VIRUS => [$virus_quarantine_method], &CC_UNCHECKED => undef, &CC_CLEAN => undef       },
   admin_maps_by_ccat         => { &CC_VIRUS => ["postmaster\@$mydomain"],  &CC_UNCHECKED => undef                           },
   lovers_maps_by_ccat        => { &CC_VIRUS => undef,                      &CC_UNCHECKED => 1                               },
   final_destiny_maps_by_ccat => { &CC_VIRUS => D_DISCARD,                  &CC_UNCHECKED => D_PASS, &CC_OVERSIZED => D_PASS },
 };
 
 $policy_bank{'INCOMING'} = {
   originating              => 0,
   enable_dkim_verification => 1,
+  protocol                 => 'LMTP',
   smtpd_greeting_banner    => '${helo-name} ${protocol} ${product} INCOMING service ready',
   forward_method           => $forward_method,
   message_size_limit_maps  => [],
 
   # Per-recipient Bayes Database
   sa_username_maps => [ new_RE ( [ qr/^(.+\@.+)$/ => '$1' ] )
                       , 'amavis' # catch-all
                       ],
 
   # Never quarantine, and never notify.
   # (Remember to disallow setting amavisSpamQuarantineCutoffLevel and
   # amavisVirusQuarantine*To in the LDAP schema.)
   # XXX: users might want to quarantine messages and get a notification instead
   quarantine_method_by_ccat  => { map {$_ => undef} (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM, CC_BADH, CC_CLEAN) },
   admin_maps_by_ccat         => { map {$_ => undef} (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM, CC_BADH          ) },
 
   # Always deliver messages
   final_destiny_maps_by_ccat => { map {$_ => D_PASS} (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM,            CC_BADH) },
   lovers_maps_by_ccat        => { map {$_ => 1     } (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM, CC_SPAMMY, CC_BADH) },
 };