Merge branch 'COOK-1233'

This commit is contained in:
jtimberman 2012-11-19 12:39:57 -07:00
commit 8f4c8a9011
3 changed files with 49 additions and 1 deletions

View File

@ -69,7 +69,29 @@ See `attributes/default.rb` for default values.
`smtpd_milters` option in `/etc/postfix/main.cf`. `smtpd_milters` option in `/etc/postfix/main.cf`.
* `node['postfix']['non_smtpd_milters']` - corresponds to the * `node['postfix']['non_smtpd_milters']` - corresponds to the
`non_smtpd_milters` option in `/etc/postfix/main.cf`. `non_smtpd_milters` option in `/etc/postfix/main.cf`.
* `node['postfix']['inet_interfaces']` - interfaces to listen to, all or loopback-only * `node['postfix']['inet_interfaces']` - interfaces to listen to, all
or loopback-only
* `node['postfix']['sender_canonical_classes']` - controls what
addresses are subject to `sender_canonical_maps` address mapping,
specify one or more of: `envelope_sender`, `header_sender` - defaults to
nil
* `node['postfix']['recipient_canonical_classes']` - controls what
addresses are subject to `recipient_canonical_maps` address mapping,
specify one or more of: `envelope_recipient`, `header_recipient` -
defaults to nil
* `node['postfix']['canonical_classes']` - controls what addresses are
subject to `canonical_maps` address mapping, specify one or more of:
`envelope_sender`, `envelope_recipient`, `header_sender`,
`header_recipient` - defaults to nil
* `node['postfix']['sender_canonical_maps']` - optional address
mapping lookup tables for envelope and header sender addresses, eg.
`hash:/etc/postfix/sender_canonical` - defaults to nil
* `node['postfix']['recipient_canonical_maps']` - optional address
mapping lookup tables for envelope and header recipient addresses,
eg. `hash:/etc/postfix/recipient_canonical` - defaults to nil
* `node['postfix']['canonical_maps']` - optional address mapping
lookup tables for message headers and envelopes, eg.
`hash:/etc/postfix/canonical` - defaults to nil
Recipes Recipes
======= =======

View File

@ -41,3 +41,10 @@ default['postfix']['smtpd_milters'] = ""
default['postfix']['non_smtpd_milters'] = "" default['postfix']['non_smtpd_milters'] = ""
default['postfix']['aliases'] = {} default['postfix']['aliases'] = {}
default['postfix']['sender_canonical_classes'] = nil
default['postfix']['recipient_canonical_classes'] = nil
default['postfix']['canonical_classes'] = nil
default['postfix']['sender_canonical_maps'] = nil
default['postfix']['recipient_canonical_maps'] = nil
default['postfix']['canonical_maps'] = nil

View File

@ -47,3 +47,22 @@ milter_default_action = <%= node['postfix']['milter_default_action'] %>
milter_protocol = <%= node['postfix']['milter_protocol'] %> milter_protocol = <%= node['postfix']['milter_protocol'] %>
smtpd_milters = <%= node['postfix']['smtpd_milters'] %> smtpd_milters = <%= node['postfix']['smtpd_milters'] %>
non_smtpd_milters = <%= node['postfix']['non_smtpd_milters'] %> non_smtpd_milters = <%= node['postfix']['non_smtpd_milters'] %>
<% unless node['postfix']['sender_canonical_classes'].nil? -%>
sender_canonical_classes = <%= node['postfix']['sender_canonical_classes'] %>
<% end -%>
<% unless node['postfix']['recipient_canonical_classes'].nil? -%>
recipient_canonical_classes = <%= node['postfix']['recipient_canonical_classes'] %>
<% end -%>
<% unless node['postfix']['canonical_classes'].nil? -%>
canonical_classes = <%= node['postfix']['canonical_classes'] %>
<% end -%>
<% unless node['postfix']['sender_canonical_maps'].nil? -%>
sender_canonical_maps = <%= node['postfix']['sender_canonical_maps'] %>
<% end -%>
<% unless node['postfix']['recipient_canonical_maps'].nil? -%>
recipient_canonical_maps = <%= node['postfix']['recipient_canonical_maps'] %>
<% end -%>
<% unless node['postfix']['canonical_maps'].nil? -%>
canonical_maps = <%= node['postfix']['canonical_maps'] %>
<% end -%>