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
|
<!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>[551] - move everything in a subclass</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>551</dd>
<dt>Author</dt> <dd>misc</dd>
<dt>Date</dt> <dd>2010-12-09 13:34:17 +0100 (Thu, 09 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>- move everything in a subclass</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#puppetmodulessympamanifestsinitpp">puppet/modules/sympa/manifests/init.pp</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-09 12:34:16 UTC (rev 550)
+++ puppet/modules/sympa/manifests/init.pp 2010-12-09 12:34:17 UTC (rev 551)
@@ -1,66 +1,67 @@
class sympa {
+ class server {
+ # perl-CGI-Fast is needed for fast cgi
+ # perl-Socket6 is required by perl-IO-Socket-SSL
+ # (optional requirement)
+ $package_list = ['sympa', 'sympa-www', 'perl-CGI-Fast',
+ 'perl-Socket6']
- # perl-CGI-Fast is needed for fast cgi
- # perl-Socket6 is required by perl-IO-Socket-SSL
- # (optional requirement)
- $package_list = ['sympa', 'sympa-www', 'perl-CGI-Fast',
- 'perl-Socket6']
-
- package { $package_list:
- ensure => installed;
+ package { $package_list:
+ ensure => installed;
+ }
+
+ # sympa script start 5 differents script, I am not
+ # sure that puppet will correctly handle this
+ service { "sympa":
+ ensure => running,
+ hasstatus => true,
+ subscribe => [ Package["sympa"]]
+ }
+
+ $password = extlookup("sympa_password",'x')
+ $ldap_passwd = extlookup("sympa_ldap",'x')
+
+ @@postgresql::user { 'sympa':
+ password => $password,
+ }
+
+ file { '/etc/sympa/sympa.conf':
+ ensure => present,
+ # should be cleaner to have it root owned, but puppet do not support acl
+ # and in any case, config will be reset if it change
+ owner => sympa,
+ group => apache,
+ mode => 640,
+ content => template("sympa/sympa.conf")
+ }
+
+ file { '/etc/sympa/auth.conf':
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 644,
+ content => template("sympa/auth.conf")
+ }
+
+
+ include apache::mod_fcgid
+ apache::webapp_other{"sympa":
+ webapp_file => "sympa/webapp_sympa.conf",
+ }
+
+ apache::vhost_other_app { "ml.$domain":
+ vhost_file => "sympa/vhost_ml.conf",
+ }
+
+ @@postgresql::database { 'sympa':
+ description => "Sympa database",
+ user => "sympa",
+ require => Postgresql::User["sympa"]
+ }
+
+ subversion::snapshot { "/etc/sympa/web_tt2":
+ source => "svn://svn.mageia.org/svn/web/templates/sympa/trunk"
+ }
}
-
- # sympa script start 5 differents script, I am not
- # sure that puppet will correctly handle this
- service { "sympa":
- ensure => running,
- hasstatus => true,
- subscribe => [ Package["sympa"]]
- }
-
- $password = extlookup("sympa_password",'x')
- $ldap_passwd = extlookup("sympa_ldap",'x')
-
- @@postgresql::user { 'sympa':
- password => $password,
- }
-
- file { '/etc/sympa/sympa.conf':
- ensure => present,
- # should be cleaner to have it root owned, but puppet do not support acl
- # and in any case, config will be reset if it change
- owner => sympa,
- group => apache,
- mode => 640,
- content => template("sympa/sympa.conf")
- }
-
- file { '/etc/sympa/auth.conf':
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- content => template("sympa/auth.conf")
- }
-
-
- include apache::mod_fcgid
- apache::webapp_other{"sympa":
- webapp_file => "sympa/webapp_sympa.conf",
- }
-
- apache::vhost_other_app { "ml.$domain":
- vhost_file => "sympa/vhost_ml.conf",
- }
-
- @@postgresql::database { 'sympa':
- description => "Sympa database",
- user => "sympa",
- require => Postgresql::User["sympa"]
- }
-
- subversion::snapshot { "/etc/sympa/web_tt2":
- source => "svn://svn.mageia.org/svn/web/templates/sympa/trunk"
- }
}
</pre></div>
</body>
</html>
|
