diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-18 18:15:00 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-18 18:15:00 +0000 |
| commit | 133e3b1ede8838508487984f0b3ac21499963919 (patch) | |
| tree | 84db14e7c48294fdb1e884ed912e46d804c044ae /modules | |
| parent | d5c21c4adf05bebef5a3dd8d631301028ca8d0da (diff) | |
| download | puppet-133e3b1ede8838508487984f0b3ac21499963919.tar puppet-133e3b1ede8838508487984f0b3ac21499963919.tar.gz puppet-133e3b1ede8838508487984f0b3ac21499963919.tar.bz2 puppet-133e3b1ede8838508487984f0b3ac21499963919.tar.xz puppet-133e3b1ede8838508487984f0b3ac21499963919.zip | |
- merge primary config file to the secondary one
- add some check in transport regexp
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/postfix/templates/primary_transport_regexp | 3 | ||||
| -rw-r--r-- | modules/postfix/templates/secondary_main.cf | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/modules/postfix/templates/primary_transport_regexp b/modules/postfix/templates/primary_transport_regexp index c1ca36cc..5d005c7b 100644 --- a/modules/postfix/templates/primary_transport_regexp +++ b/modules/postfix/templates/primary_transport_regexp @@ -1,5 +1,8 @@ <% ml_domain = 'ml\.' + domain.gsub('.','\.') %> +<%- if classes.include?('sympa') -%> /^.*+owner\@<%= ml_domain %>$/ sympabounce: /^.*\@<%= ml_domain %>$/ sympa: +<%- end -%> + diff --git a/modules/postfix/templates/secondary_main.cf b/modules/postfix/templates/secondary_main.cf index ae27ac00..f5f83eed 100644 --- a/modules/postfix/templates/secondary_main.cf +++ b/modules/postfix/templates/secondary_main.cf @@ -30,7 +30,16 @@ myhostname = <%= fqdn %> mydomain = <%= domain %> mydestination = <%= fqdn %> myorigin = $mydomain -relay_domains = $mydestination, ml.<%= domain %>, <%= domain %> +relay_domains = $mydestination, + ml.<%= domain %>, +<%- if classes.include?('primary_smtp') -%> + <%= 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 |