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
|
<!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>[193] - remove tabulation ( so indentation is really fixed )</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>193</dd>
<dt>Author</dt> <dd>misc</dd>
<dt>Date</dt> <dd>2010-11-08 00:36:49 +0100 (Mon, 08 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>- remove tabulation ( so indentation is really fixed )
- clean old comments ( ie, things we deployed )</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li>
</ul>
</div>
<div id="patch"><pre>
<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a>
===================================================================
--- puppet/manifests/nodes.pp 2010-11-07 23:30:39 UTC (rev 192)
+++ puppet/manifests/nodes.pp 2010-11-07 23:36:49 UTC (rev 193)
@@ -9,7 +9,6 @@
# - setup restricted shell access to allow "mdvsys submit" to work
# - setup maintainers database (with web interface)
# - mirroring (Nanar)
-# - LDAP master
#
include default_mageia_server
timezone::timezone { "Europe/Paris": }
@@ -40,11 +39,10 @@
# - mail server
# - mailing list server
# - wiki
-# - pastbin
+# - pastebin
# - LDAP slave
-# - SQL server
#
- include default_mageia_server
+ include default_mageia_server
include bind::bind_master
include postgresql
bind::zone_master { "mageia.org": }
@@ -61,16 +59,16 @@
node jonund {
# Location: IELO datacenter (marseille)
#
- include default_mageia_server
- include iurt
+ include default_mageia_server
+ include iurt
timezone::timezone { "Europe/Paris": }
}
node ecosse {
# Location: IELO datacenter (marseille)
#
- include default_mageia_server
- include iurt
+ include default_mageia_server
+ include iurt
timezone::timezone { "Europe/Paris": }
}
@@ -82,8 +80,8 @@
# TODO:
# - buy the server
# - install the server in datacenter
-#
- include default_mageia_server
+# - install a backup system
+ include default_mageia_server
}
# gandi-vm
@@ -94,7 +92,7 @@
# - secondary MX
# - LDAP slave (for external traffic maybe)
#
- include default_mageia_server
+ include default_mageia_server
include bind::bind_master
bind::zone_master { "mageia.org": }
bind::zone_master { "mageia.fr": }
@@ -110,10 +108,9 @@
# - setup mageia.org web site
# - setup blog
#
- include default_mageia_server
+ include default_mageia_server
include apache::base
timezone::timezone { "Europe/Paris": }
- #include postfix
include blog
}
</pre></div>
</body>
</html>
|
