Modified: puppet/modules/postfix/templates/main.cf =================================================================== --- puppet/modules/postfix/templates/main.cf 2010-11-19 13:11:28 UTC (rev 325) +++ puppet/modules/postfix/templates/main.cf 2010-11-19 20:18:57 UTC (rev 326) @@ -42,10 +42,12 @@ <%= domain %> <%- end -%> transport_maps = regexp:/etc/postfix/transport_regexp + <% if classes.include?('sympa') %> sympa_destination_recipient_limit = 1 sympabounce_destination_recipient_limit = 1 <% end %> + #delay_warning_time = 4h smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (Mandriva Linux) unknown_local_recipient_reject_code = 450 @@ -57,17 +59,21 @@ smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt <% if classes.include?('postfix::smtp_server') %> +smtpd_etrn_restrictions = reject + +smtpd_helo_required = yes + +smtpd_data_restrictions = reject_unauth_pipelining + reject_multi_recipient_bounce + smtpd_recipient_restrictions = # not done yet # permit_sasl_authenticated + reject_non_fqdn_recipient + reject_non_fqdn_sender permit_mynetworks reject_unauth_destination - reject_unauth_pipelining - reject_non_fqdn_recipient - reject_non_fqdn_sender - reject_non_fqdn_hostname - reject_invalid_hostname - reject_unknown_recipient_domain + reject_non_fqdn_helo_hostname reject_unknown_sender_domain reject_unknown_client <% if classes.include?('postgrey') %>