/[adm]/puppet/modules/postfix/templates/main.cf
ViewVC logotype

Diff of /puppet/modules/postfix/templates/main.cf

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 328 by misc, Fri Nov 19 20:18:58 2010 UTC revision 329 by misc, Fri Nov 19 20:19:01 2010 UTC
# Line 23  mail_owner = postfix Line 23  mail_owner = postfix
23    
24  # User configurable parameters  # User configurable parameters
25    
26  <% if classes.include?('postfix::simple_relay') %>  <% if all_tags.include?('postfix::simple_relay') %>
27  inet_interfaces = localhost  inet_interfaces = localhost
28  <% else %>  <% else %>
29  inet_interfaces = all  inet_interfaces = all
# Line 35  myhostname = <%= fqdn %> Line 35  myhostname = <%= fqdn %>
35  mydomain = <%= domain %>  mydomain = <%= domain %>
36  mydestination = <%= fqdn %>  mydestination = <%= fqdn %>
37  myorigin = $mydomain  myorigin = $mydomain
38  <%- if classes.include?('postfix::smtp_server') -%>  <%- if all_tags.include?('postfix::smtp_server') -%>
39  relay_domains = $mydestination,  relay_domains = $mydestination,
40                  ml.<%= domain %>,                  ml.<%= domain %>,
41  <%- if classes.include?('postfix::primary_smtp') -%>  <%- if all_tags.include?('postfix::primary_smtp') -%>
42                  <%= domain %>                  <%= domain %>
43  <%- end -%>  <%- end -%>
44  transport_maps = regexp:/etc/postfix/transport_regexp  transport_maps = regexp:/etc/postfix/transport_regexp
45  <%- end -%>  <%- end -%>
46    
47  <% if classes.include?('sympa') %>  <%- if classes.include?('sympa') -%>
48  sympa_destination_recipient_limit = 1  sympa_destination_recipient_limit = 1
49  sympabounce_destination_recipient_limit = 1  sympabounce_destination_recipient_limit = 1
50  <% end %>  <%- end -%>
51    
52  #delay_warning_time = 4h  #delay_warning_time = 4h
53  smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (Mandriva Linux)  smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (Mandriva Linux)
# Line 59  smtpd_tls_cert_file = /etc/pki/tls/certs Line 59  smtpd_tls_cert_file = /etc/pki/tls/certs
59  smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem  smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
60  smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt  smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
61    
62  <% if classes.include?('postfix::smtp_server') %>  <%- if all_tags.include?('postfix::smtp_server') -%>
63  smtpd_etrn_restrictions = reject  smtpd_etrn_restrictions = reject
64    
65  smtpd_helo_required = yes  smtpd_helo_required = yes
# Line 67  smtpd_helo_required = yes Line 67  smtpd_helo_required = yes
67  smtpd_data_restrictions = reject_unauth_pipelining  smtpd_data_restrictions = reject_unauth_pipelining
68                            reject_multi_recipient_bounce                            reject_multi_recipient_bounce
69    
70  smtpd_recipient_restrictions =  smtpd_recipient_restrictions = reject_non_fqdn_recipient
 #    not done yet  
 #    permit_sasl_authenticated  
     reject_non_fqdn_recipient  
71      reject_non_fqdn_sender      reject_non_fqdn_sender
72    #    not done yet, not sure if we need to offer this kind of service
73    #    permit_sasl_authenticated
74      permit_mynetworks      permit_mynetworks
75      reject_unauth_destination      reject_unauth_destination
76      reject_non_fqdn_helo_hostname      reject_non_fqdn_helo_hostname
77      reject_unknown_sender_domain      reject_unknown_sender_domain
78      reject_unknown_client      reject_unknown_client
79    <% if classes.include?('postgrey') %>    <%- if classes.include?('postgrey') -%>
80      check_policy_service unix:extern/postgrey/socket      check_policy_service unix:extern/postgrey/socket
81    <% end %>    <%- end -%>
82  <% end %>  <%- end -%>
83    

Legend:
Removed from v.328  
changed lines
  Added in v.329

  ViewVC Help
Powered by ViewVC 1.1.28