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
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[329] - use all_tags instead of classes because of some obscure puppet issues,</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>329</dd>
<dt>Author</dt> <dd>misc</dd>
<dt>Date</dt> <dd>2010-11-19 21:19:01 +0100 (Fri, 19 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>- 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 <%- )</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#puppetmodulespostfixtemplatesmaincf">puppet/modules/postfix/templates/main.cf</a></li>
</ul>
</div>
<div id="patch"><pre>
<a id="puppetmodulespostfixtemplatesmaincf">Modified: puppet/modules/postfix/templates/main.cf</a>
===================================================================
--- 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 -%>
</pre></div>
</body>
</html>
|
