From 16e2b58935b35837c220ca92d285955fa1af19a1 Mon Sep 17 00:00:00 2001 From: David Joos Date: Tue, 2 Oct 2012 13:54:25 +0100 Subject: [PATCH] Addition of new attributes as default (nil) & README update with example values --- README.md | 24 +++++++++++++++++++++++- attributes/default.rb | 7 +++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 88336e8..d75ac85 100644 --- a/README.md +++ b/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 ======= diff --git a/attributes/default.rb b/attributes/default.rb index 96d2b57..dcb3172 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -41,3 +41,10 @@ default['postfix']['smtpd_milters'] = "" 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