Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'COOK-1233'

  • Loading branch information...
commit 8f4c8a9011241115ff1b215d8035db1fc3167012 2 parents 02b9f24 + 16e2b58
@jtimberman jtimberman authored
View
24 README.md
@@ -69,7 +69,29 @@ See `attributes/default.rb` for default values.
`smtpd_milters` option in `/etc/postfix/main.cf`.
* `node['postfix']['non_smtpd_milters']` - corresponds to the
`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
=======
View
7 attributes/default.rb
@@ -41,3 +41,10 @@
default['postfix']['non_smtpd_milters'] = ""
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
19 templates/default/main.cf.erb
@@ -47,3 +47,22 @@ milter_default_action = <%= node['postfix']['milter_default_action'] %>
milter_protocol = <%= node['postfix']['milter_protocol'] %>
smtpd_milters = <%= node['postfix']['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 -%>
Please sign in to comment.
Something went wrong with that request. Please try again.