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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [329] - use all_tags instead of classes because of some obscure puppet issues,
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B329%5D%20-%20use%20all_tags%20instead%20of%20classes%20because%20of%0A%20some%20obscure%20puppet%20issues%2C%20&In-Reply-To=%3C20101119201901.CD8993FC09%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="000670.html">
<LINK REL="Next" HREF="000671.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [329] - use all_tags instead of classes because of some obscure puppet issues, </H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B329%5D%20-%20use%20all_tags%20instead%20of%20classes%20because%20of%0A%20some%20obscure%20puppet%20issues%2C%20&In-Reply-To=%3C20101119201901.CD8993FC09%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [329] - use all_tags instead of classes because of some obscure puppet issues, ">root at mageia.org
</A><BR>
<I>Fri Nov 19 21:19:01 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000670.html">[Mageia-sysadm] [328] - add some more attribute, just to be sure
</A></li>
<LI>Next message: <A HREF="000671.html">[Mageia-sysadm] [330] - fix config for secondary smtp
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#672">[ date ]</a>
<a href="thread.html#672">[ thread ]</a>
<a href="subject.html#672">[ subject ]</a>
<a href="author.html#672">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 329
Author: misc
Date: 2010-11-19 21:19:01 +0100 (Fri, 19 Nov 2010)
Log Message:
-----------
- use all_tags instead of classes because of some obscure puppet issues,
basically, classes correspond to the classes when the ressource is
declared, not to the one of the node ( which is given by
all_tags )
- remove empty line ( with <%- )
Modified Paths:
--------------
puppet/modules/postfix/templates/main.cf
Modified: puppet/modules/postfix/templates/main.cf
===================================================================
--- puppet/modules/postfix/templates/main.cf 2010-11-19 20:19:00 UTC (rev 328)
+++ puppet/modules/postfix/templates/main.cf 2010-11-19 20:19:01 UTC (rev 329)
@@ -23,7 +23,7 @@
# User configurable parameters
-<% if classes.include?('postfix::simple_relay') %>
+<% if all_tags.include?('postfix::simple_relay') %>
inet_interfaces = localhost
<% else %>
inet_interfaces = all
@@ -35,19 +35,19 @@
mydomain = <%= domain %>
mydestination = <%= fqdn %>
myorigin = $mydomain
-<%- if classes.include?('postfix::smtp_server') -%>
+<%- if all_tags.include?('postfix::smtp_server') -%>
relay_domains = $mydestination,
ml.<%= domain %>,
-<%- if classes.include?('postfix::primary_smtp') -%>
+<%- if all_tags.include?('postfix::primary_smtp') -%>
<%= domain %>
<%- end -%>
transport_maps = regexp:/etc/postfix/transport_regexp
<%- end -%>
-<% if classes.include?('sympa') %>
+<%- if classes.include?('sympa') -%>
sympa_destination_recipient_limit = 1
sympabounce_destination_recipient_limit = 1
-<% end %>
+<%- end -%>
#delay_warning_time = 4h
smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (Mandriva Linux)
@@ -59,7 +59,7 @@
smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
-<% if classes.include?('postfix::smtp_server') %>
+<%- if all_tags.include?('postfix::smtp_server') -%>
smtpd_etrn_restrictions = reject
smtpd_helo_required = yes
@@ -67,18 +67,17 @@
smtpd_data_restrictions = reject_unauth_pipelining
reject_multi_recipient_bounce
-smtpd_recipient_restrictions =
-# not done yet
-# permit_sasl_authenticated
- reject_non_fqdn_recipient
+smtpd_recipient_restrictions = reject_non_fqdn_recipient
reject_non_fqdn_sender
+# not done yet, not sure if we need to offer this kind of service
+# permit_sasl_authenticated
permit_mynetworks
reject_unauth_destination
reject_non_fqdn_helo_hostname
reject_unknown_sender_domain
reject_unknown_client
- <% if classes.include?('postgrey') %>
+ <%- if classes.include?('postgrey') -%>
check_policy_service unix:extern/postgrey/socket
- <% end %>
-<% end %>
+ <%- end -%>
+<%- end -%>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101119/2e53b517/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000670.html">[Mageia-sysadm] [328] - add some more attribute, just to be sure
</A></li>
<LI>Next message: <A HREF="000671.html">[Mageia-sysadm] [330] - fix config for secondary smtp
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#672">[ date ]</a>
<a href="thread.html#672">[ thread ]</a>
<a href="subject.html#672">[ subject ]</a>
<a href="author.html#672">[ 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>
|
