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
|
<!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>[644] - allow to set the topic of the list ( useful to sort them on interface</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>644</dd>
<dt>Author</dt> <dd>misc</dd>
<dt>Date</dt> <dd>2010-12-17 01:50:56 +0100 (Fri, 17 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>- allow to set the topic of the list ( useful to sort them on interface
)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#puppetmodulessympamanifestsinitpp">puppet/modules/sympa/manifests/init.pp</a></li>
<li><a href="#puppetmodulessympatemplatesconfig">puppet/modules/sympa/templates/config</a></li>
</ul>
</div>
<div id="patch"><pre>
<a id="puppetmodulessympamanifestsinitpp">Modified: puppet/modules/sympa/manifests/init.pp</a>
===================================================================
--- puppet/modules/sympa/manifests/init.pp 2010-12-17 00:50:55 UTC (rev 643)
+++ puppet/modules/sympa/manifests/init.pp 2010-12-17 00:50:56 UTC (rev 644)
@@ -173,6 +173,7 @@
define list($subject,
$profile = false,
$language = 'en',
+ $topics = false,
$reply_to = false,
$sender_email = false,
$sender_ldap_group = false,
@@ -232,7 +233,7 @@
# various types of list that can be directly used
#
#
- define public_list($subject, $language = 'en') {
+ define public_list($subject, $language = 'en', $topics = false) {
list { $name:
subject => $subject,
# profile => "public",
@@ -242,7 +243,7 @@
# list where announce are sent by member of ldap_group
# reply_to is set to $reply_to
- define announce_list_group($subject, $reply_to, $sender_ldap_group, $language = 'en') {
+ define announce_list_group($subject, $reply_to, $sender_ldap_group, $language = 'en', $topics = false) {
# profile + scenario
list{ $name:
subject => $subject,
@@ -256,7 +257,7 @@
# list where announce are sent by $email only
# reply_to is set to $reply_to
- define announce_list_email($subject, $reply_to, $sender_email, $language = 'en') {
+ define announce_list_email($subject, $reply_to, $sender_email, $language = 'en', $topics = false) {
list{ $name:
subject => $subject,
profile => "",
@@ -268,7 +269,7 @@
# list where people cannot subscribe, where people from $ldap_group receive
# mail, with public archive
- define restricted_list($subject, $subscriber_ldap_group, $language = 'en') {
+ define restricted_list($subject, $subscriber_ldap_group, $language = 'en', $topics = false) {
list{ $name:
subject => $subject,
profile => "",
@@ -279,7 +280,7 @@
}
# same as restricted list, but anybody can post
- define restricted_list_open($subject, $subscriber_ldap_group, $language = 'en') {
+ define restricted_list_open($subject, $subscriber_ldap_group, $language = 'en', $topics = false) {
list{ $name:
subject => $subject,
profile => "",
@@ -290,7 +291,7 @@
}
# list with private archive, restricted to member of $ldap_group
- define private_list($subject, $subscriber_ldap_group, $language ='en') {
+ define private_list($subject, $subscriber_ldap_group, $language ='en', $topics = false) {
list{ $name:
subject => $subject,
profile => "",
@@ -304,7 +305,7 @@
# list with private archive, restricted to member of $ldap_group
# everybody can post
# used for contact alias
- define private_list_open($subject, $subscriber_ldap_group, $language ='en') {
+ define private_list_open($subject, $subscriber_ldap_group, $language ='en', $topics = false) {
list{ $name:
subject => $subject,
profile => "",
@@ -316,7 +317,7 @@
# same as private_list, but post are restricted to $email
# ( scripting )
- define private_list_email($subject, $subscriber_ldap_group, $sender_email, $language ='en') {
+ define private_list_email($subject, $subscriber_ldap_group, $sender_email, $language ='en', $topics = false) {
list{ $name:
subject => $subject,
profile => "",
<a id="puppetmodulessympatemplatesconfig">Modified: puppet/modules/sympa/templates/config</a>
===================================================================
--- puppet/modules/sympa/templates/config 2010-12-17 00:50:55 UTC (rev 643)
+++ puppet/modules/sympa/templates/config 2010-12-17 00:50:56 UTC (rev 644)
@@ -67,8 +67,9 @@
<% end %>
-#TODO topics
-# topics
+<% if topics %>
+topics <%= topics %>
+<% end %>
<% if subscriber_ldap_group %>
include_ldap_query
</pre></div>
</body>
</html>
|
