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
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [288] - finish the merge of the 2 config file
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B288%5D%20-%20finish%20the%20merge%20of%20the%202%20config%20file&In-Reply-To=%3C20101118181921.8E2B03FBCB%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="000620.html">
<LINK REL="Next" HREF="000623.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [288] - finish the merge of the 2 config file</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B288%5D%20-%20finish%20the%20merge%20of%20the%202%20config%20file&In-Reply-To=%3C20101118181921.8E2B03FBCB%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [288] - finish the merge of the 2 config file">root at mageia.org
</A><BR>
<I>Thu Nov 18 19:19:21 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000620.html">[Mageia-sysadm] [287] - merge primary config file to the secondary one
</A></li>
<LI>Next message: <A HREF="000623.html">[Mageia-sysadm] [289] Add vhost and webapps.d files for bugzilla
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#621">[ date ]</a>
<a href="thread.html#621">[ thread ]</a>
<a href="subject.html#621">[ subject ]</a>
<a href="author.html#621">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 288
Author: misc
Date: 2010-11-18 19:19:21 +0100 (Thu, 18 Nov 2010)
Log Message:
-----------
- finish the merge of the 2 config file
Modified Paths:
--------------
puppet/modules/postfix/manifests/init.pp
Added Paths:
-----------
puppet/modules/postfix/templates/main.cf
puppet/modules/postfix/templates/transport_regexp
Removed Paths:
-------------
puppet/modules/postfix/templates/primary_main.cf
puppet/modules/postfix/templates/primary_transport_regexp
puppet/modules/postfix/templates/secondary_main.cf
Modified: puppet/modules/postfix/manifests/init.pp
===================================================================
--- puppet/modules/postfix/manifests/init.pp 2010-11-18 18:15:00 UTC (rev 287)
+++ puppet/modules/postfix/manifests/init.pp 2010-11-18 18:19:21 UTC (rev 288)
@@ -33,26 +33,27 @@
class smtp_server inherits base {
include postgrey
+ file { '/etc/postfix/main.cf':
+ content => template("postfix/main.cf"),
+ }
+
+ file { '/etc/postfix/transport_regexp':
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 644,
+ content => template("postfix/transport_regexp"),
+ }
+
}
class primary_smtp inherits smtp_server {
- file { '/etc/postfix/main.cf':
- content => template("postfix/primary_main.cf"),
- }
-
file { '/etc/postfix/master.cf':
content => template("postfix/primary_master.cf"),
}
-
- file { '/etc/postfix/transport_regexp':
- content => template("postfix/primary_transport_regexp"),
- }
}
class secondary_smtp inherits smtp_server {
- file { '/etc/postfix/main.cf':
- content => template("postfix/secondary_main.cf"),
- }
}
}
Copied: puppet/modules/postfix/templates/main.cf (from rev 287, puppet/modules/postfix/templates/secondary_main.cf)
===================================================================
--- puppet/modules/postfix/templates/main.cf (rev 0)
+++ puppet/modules/postfix/templates/main.cf 2010-11-18 18:19:21 UTC (rev 288)
@@ -0,0 +1,51 @@
+# Please be sure to read the /usr/share/doc/postfix/README.MDK file
+# to learn about differences from stock postfix to Mandriva package.
+# This file contains only the parameters changed from a default install
+# see /etc/postfix/main.cf.dist for a commented, fuller version of this file.
+
+<%
+path_daemon_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/postfix/"
+%>
+
+# These are changed by postfix install script
+readme_directory = /usr/share/doc/postfix/README_FILES
+html_directory = /usr/share/doc/postfix/html
+sendmail_path = /usr/sbin/sendmail.postfix
+setgid_group = postdrop
+command_directory = /usr/sbin
+manpage_directory = /usr/share/man
+daemon_directory = <%= path_daemon_directory %>
+data_directory = /var/lib/postfix
+newaliases_path = /usr/bin/newaliases
+mailq_path = /usr/bin/mailq
+queue_directory = /var/spool/postfix
+mail_owner = postfix
+
+# User configurable parameters
+
+inet_interfaces = localhost
+inet_protocols = all
+mynetworks_style = host
+myhostname = <%= fqdn %>
+mydomain = <%= domain %>
+mydestination = <%= fqdn %>
+myorigin = $mydomain
+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
+smtp-filter_destination_concurrency_limit = 2
+lmtp-filter_destination_concurrency_limit = 2
+smtpd_use_tls = yes
+smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
+smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
+smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
Deleted: puppet/modules/postfix/templates/primary_main.cf
===================================================================
--- puppet/modules/postfix/templates/primary_main.cf 2010-11-18 18:15:00 UTC (rev 287)
+++ puppet/modules/postfix/templates/primary_main.cf 2010-11-18 18:19:21 UTC (rev 288)
@@ -1,45 +0,0 @@
-# Please be sure to read the /usr/share/doc/postfix/README.MDK file
-# to learn about differences from stock postfix to Mandriva package.
-# This file contains only the parameters changed from a default install
-# see /etc/postfix/main.cf.dist for a commented, fuller version of this file.
-
-<%
-path_daemon_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/postfix/"
-%>
-
-# These are changed by postfix install script
-readme_directory = /usr/share/doc/postfix/README_FILES
-html_directory = /usr/share/doc/postfix/html
-sendmail_path = /usr/sbin/sendmail.postfix
-setgid_group = postdrop
-command_directory = /usr/sbin
-manpage_directory = /usr/share/man
-daemon_directory = <%= path_daemon_directory %>
-data_directory = /var/lib/postfix
-newaliases_path = /usr/bin/newaliases
-mailq_path = /usr/bin/mailq
-queue_directory = /var/spool/postfix
-mail_owner = postfix
-
-# User configurable parameters
-
-inet_interfaces = localhost
-inet_protocols = all
-mynetworks_style = host
-myhostname = <%= fqdn %>
-mydomain = <%= domain %>
-mydestination = <%= fqdn %>
-myorigin = $mydomain
-relay_domains = $mydestination, ml.<%= domain %>
-transport_maps = regexp:/etc/postfix/transport_regexp
-sympa_destination_recipient_limit = 1
-sympabounce_destination_recipient_limit = 1
-#delay_warning_time = 4h
-smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (Mandriva Linux)
-unknown_local_recipient_reject_code = 450
-smtp-filter_destination_concurrency_limit = 2
-lmtp-filter_destination_concurrency_limit = 2
-smtpd_use_tls = yes
-smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
-smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
-smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
Deleted: puppet/modules/postfix/templates/primary_transport_regexp
===================================================================
--- puppet/modules/postfix/templates/primary_transport_regexp 2010-11-18 18:15:00 UTC (rev 287)
+++ puppet/modules/postfix/templates/primary_transport_regexp 2010-11-18 18:19:21 UTC (rev 288)
@@ -1,8 +0,0 @@
-<%
-ml_domain = 'ml\.' + domain.gsub('.','\.')
-%>
-<%- if classes.include?('sympa') -%>
-/^.*+owner\@<%= ml_domain %>$/ sympabounce:
-/^.*\@<%= ml_domain %>$/ sympa:
-<%- end -%>
-
Deleted: puppet/modules/postfix/templates/secondary_main.cf
===================================================================
--- puppet/modules/postfix/templates/secondary_main.cf 2010-11-18 18:15:00 UTC (rev 287)
+++ puppet/modules/postfix/templates/secondary_main.cf 2010-11-18 18:19:21 UTC (rev 288)
@@ -1,51 +0,0 @@
-# Please be sure to read the /usr/share/doc/postfix/README.MDK file
-# to learn about differences from stock postfix to Mandriva package.
-# This file contains only the parameters changed from a default install
-# see /etc/postfix/main.cf.dist for a commented, fuller version of this file.
-
-<%
-path_daemon_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/postfix/"
-%>
-
-# These are changed by postfix install script
-readme_directory = /usr/share/doc/postfix/README_FILES
-html_directory = /usr/share/doc/postfix/html
-sendmail_path = /usr/sbin/sendmail.postfix
-setgid_group = postdrop
-command_directory = /usr/sbin
-manpage_directory = /usr/share/man
-daemon_directory = <%= path_daemon_directory %>
-data_directory = /var/lib/postfix
-newaliases_path = /usr/bin/newaliases
-mailq_path = /usr/bin/mailq
-queue_directory = /var/spool/postfix
-mail_owner = postfix
-
-# User configurable parameters
-
-inet_interfaces = localhost
-inet_protocols = all
-mynetworks_style = host
-myhostname = <%= fqdn %>
-mydomain = <%= domain %>
-mydestination = <%= fqdn %>
-myorigin = $mydomain
-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
-smtp-filter_destination_concurrency_limit = 2
-lmtp-filter_destination_concurrency_limit = 2
-smtpd_use_tls = yes
-smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
-smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
-smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
Copied: puppet/modules/postfix/templates/transport_regexp (from rev 287, puppet/modules/postfix/templates/primary_transport_regexp)
===================================================================
--- puppet/modules/postfix/templates/transport_regexp (rev 0)
+++ puppet/modules/postfix/templates/transport_regexp 2010-11-18 18:19:21 UTC (rev 288)
@@ -0,0 +1,8 @@
+<%
+ml_domain = 'ml\.' + domain.gsub('.','\.')
+%>
+<%- if classes.include?('sympa') -%>
+/^.*+owner\@<%= ml_domain %>$/ sympabounce:
+/^.*\@<%= ml_domain %>$/ sympa:
+<%- end -%>
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101118/848b6bcb/attachment-0001.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000620.html">[Mageia-sysadm] [287] - merge primary config file to the secondary one
</A></li>
<LI>Next message: <A HREF="000623.html">[Mageia-sysadm] [289] Add vhost and webapps.d files for bugzilla
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#621">[ date ]</a>
<a href="thread.html#621">[ thread ]</a>
<a href="subject.html#621">[ subject ]</a>
<a href="author.html#621">[ 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>
|
