[Mageia-sysadm] [287] - merge primary config file to the secondary one

[root at mageia.org]

Revision: 287
Author:   misc
Date:     2010-11-18 19:15:00 +0100 (Thu, 18 Nov 2010)
Log Message:
-----------
- merge primary config file to the secondary one
- add some check in transport regexp

Modified Paths:
--------------
    puppet/modules/postfix/templates/primary_transport_regexp
    puppet/modules/postfix/templates/secondary_main.cf

Modified: puppet/modules/postfix/templates/primary_transport_regexp
===================================================================
--- puppet/modules/postfix/templates/primary_transport_regexp	2010-11-18 18:10:02 UTC (rev 286)
+++ puppet/modules/postfix/templates/primary_transport_regexp	2010-11-18 18:15:00 UTC (rev 287)
@@ -1,5 +1,8 @@
 <%
 ml_domain = 'ml\.' + domain.gsub('.','\.')
 %>
+<%- if classes.include?('sympa') -%>
 /^.*+owner\@<%= ml_domain %>$/ sympabounce:
 /^.*\@<%= ml_domain %>$/       sympa:
+<%- end -%>
+

Modified: puppet/modules/postfix/templates/secondary_main.cf
===================================================================
--- puppet/modules/postfix/templates/secondary_main.cf	2010-11-18 18:10:02 UTC (rev 286)
+++ puppet/modules/postfix/templates/secondary_main.cf	2010-11-18 18:15:00 UTC (rev 287)
@@ -30,7 +30,16 @@
 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101118/34aaedde/attachment.html>