zarb-ml/mageia-sysadm/2010-November/000620.html


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [287] - merge primary config file to the secondary	one
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B287%5D%20-%20merge%20primary%20config%20file%20to%20the%20secondary%0A%09one&In-Reply-To=%3C20101118181500.886EF3FBCB%40valstar.mageia.org%3E">
   <META NAME="robots" CONTENT="index,nofollow">
   <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <LINK REL="Previous"  HREF="000619.html">
   <LINK REL="Next"  HREF="000621.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [287] - merge primary config file to the secondary	one</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B287%5D%20-%20merge%20primary%20config%20file%20to%20the%20secondary%0A%09one&In-Reply-To=%3C20101118181500.886EF3FBCB%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [287] - merge primary config file to the secondary	one">root at mageia.org
       </A><BR>
    <I>Thu Nov 18 19:15:00 CET 2010</I>
    <P><UL>
        <LI>Previous message: <A HREF="000619.html">[Mageia-sysadm] [286] - do include sympa process only if sympa	class is used
</A></li>
        <LI>Next message: <A HREF="000621.html">[Mageia-sysadm] [288] - finish the merge of the 2 config file
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#620">[ date ]</a>
              <a href="thread.html#620">[ thread ]</a>
              <a href="subject.html#620">[ subject ]</a>
              <a href="author.html#620">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>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 @@
 &lt;%
 ml_domain = 'ml\.' + domain.gsub('.','\.')
 %&gt;
+&lt;%- if classes.include?('sympa') -%&gt;
 /^.*+owner\@&lt;%= ml_domain %&gt;$/ sympabounce:
 /^.*\@&lt;%= ml_domain %&gt;$/       sympa:
+&lt;%- end -%&gt;
+

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 = &lt;%= domain %&gt;
 mydestination = &lt;%= fqdn %&gt;
 myorigin = $mydomain
-relay_domains = $mydestination, ml.&lt;%= domain %&gt;, &lt;%= domain %&gt;
+relay_domains = $mydestination, 
+                ml.&lt;%= domain %&gt;, 
+&lt;%- if classes.include?('primary_smtp') -%&gt; 
+                &lt;%= domain %&gt;
+&lt;%- end -%&gt;
+transport_maps = regexp:/etc/postfix/transport_regexp
+&lt;% if classes.include?('sympa') %&gt;
+sympa_destination_recipient_limit = 1
+sympabounce_destination_recipient_limit = 1
+&lt;% end %&gt;
 #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: &lt;/pipermail/mageia-sysadm/attachments/20101118/34aaedde/attachment.html&gt;
</PRE>


<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="000619.html">[Mageia-sysadm] [286] - do include sympa process only if sympa	class is used
</A></li>
	<LI>Next message: <A HREF="000621.html">[Mageia-sysadm] [288] - finish the merge of the 2 config file
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#620">[ date ]</a>
              <a href="thread.html#620">[ thread ]</a>
              <a href="subject.html#620">[ subject ]</a>
              <a href="author.html#620">[ author ]</a>
         </LI>
       </UL>

<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>