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
|
<!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>[44] - correctly manage timezone on server </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%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>44</dd>
<dt>Author</dt> <dd>misc</dd>
<dt>Date</dt> <dd>2010-10-27 17:51:23 +0200 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>- correctly manage timezone on server </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#puppetmanifestscommonpp">puppet/manifests/common.pp</a></li>
<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li>
<li><a href="#puppetmodulestimezonemanifestsinitpp">puppet/modules/timezone/manifests/init.pp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="puppetmanifestscommonpp"></a>
<div class="modfile"><h4>Modified: puppet/manifests/common.pp (43 => 44)</h4>
<pre class="diff"><span>
<span class="info">--- puppet/manifests/common.pp 2010-10-27 15:21:48 UTC (rev 43)
+++ puppet/manifests/common.pp 2010-10-27 15:51:23 UTC (rev 44)
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class default_mageia_server {
</span><ins>+ include timezone
+
</ins><span class="cx"> # to include later
</span><span class="cx"> include openssh
</span><span class="cx"> # include puppet
</span></span></pre></div>
<a id="puppetmanifestsnodespp"></a>
<div class="modfile"><h4>Modified: puppet/manifests/nodes.pp (43 => 44)</h4>
<pre class="diff"><span>
<span class="info">--- puppet/manifests/nodes.pp 2010-10-27 15:21:48 UTC (rev 43)
+++ puppet/manifests/nodes.pp 2010-10-27 15:51:23 UTC (rev 44)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> # svn, big important server
</span><span class="cx"> node valstar {
</span><span class="cx"> include default_mageia_server
</span><del>- #timezone { "Europe/Paris": }
</del><ins>+ timezone::timezone { "Europe/Paris": }
</ins><span class="cx"> include rsyncd
</span><span class="cx"> include mirror
</span><span class="cx">
</span><span class="lines">@@ -39,22 +39,22 @@
</span><span class="cx">
</span><span class="cx"> # web apps
</span><span class="cx"> node alamut {
</span><del>- #timezone { "Europe/Paris": }
</del><span class="cx"> include default_mageia_server
</span><span class="cx"> include bind::bind_master
</span><span class="cx"> bind::zone_master { "mageia.org": }
</span><span class="cx"> bind::zone_master { "mageia.fr": }
</span><ins>+ timezone::timezone { "Europe/Paris": }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # buildnode
</span><span class="cx"> node jonund {
</span><del>- #timezone { "Europe/Paris": }
</del><span class="cx"> include default_mageia_server
</span><ins>+ timezone::timezone { "Europe/Paris": }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> node ecosse {
</span><del>- #timezone { "Europe/Paris": }
</del><span class="cx"> include default_mageia_server
</span><ins>+ timezone::timezone { "Europe/Paris": }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -65,9 +65,9 @@
</span><span class="cx">
</span><span class="cx"> # gandi-vm
</span><span class="cx"> node krampouezh {
</span><del>- #timezone { "Europe/Paris": }
</del><span class="cx"> include default_mageia_server
</span><span class="cx"> include bind::bind_slave
</span><ins>+ timezone::timezone { "Europe/Paris": }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> node champagne {
</span></span></pre></div>
<a id="puppetmodulestimezonemanifestsinitpp"></a>
<div class="modfile"><h4>Modified: puppet/modules/timezone/manifests/init.pp (43 => 44)</h4>
<pre class="diff"><span>
<span class="info">--- puppet/modules/timezone/manifests/init.pp 2010-10-27 15:21:48 UTC (rev 43)
+++ puppet/modules/timezone/manifests/init.pp 2010-10-27 15:51:23 UTC (rev 44)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx">
</span><span class="cx"> class timezone {
</span><del>- file { "/etc/localtime":
- ensure => "/usr/share/zoneinfo/$name"
</del><ins>+ define timezone() {
+ file { "/etc/localtime":
+ ensure => "/usr/share/zoneinfo/$name"
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>
|
