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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [828] split mirror class in mirror::base and mirror::main
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B828%5D%20split%20mirror%20class%20in%20mirror%3A%3Abase%20and%0A%09mirror%3A%3Amain&In-Reply-To=%3C20110118151030.EF13B428EE%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="002185.html">
<LINK REL="Next" HREF="002187.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [828] split mirror class in mirror::base and mirror::main</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B828%5D%20split%20mirror%20class%20in%20mirror%3A%3Abase%20and%0A%09mirror%3A%3Amain&In-Reply-To=%3C20110118151030.EF13B428EE%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [828] split mirror class in mirror::base and mirror::main">root at mageia.org
</A><BR>
<I>Tue Jan 18 16:10:30 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002185.html">[Mageia-sysadm] [317] Re-apply blino's fix
</A></li>
<LI>Next message: <A HREF="002187.html">[Mageia-sysadm] [829] start the migration of blogs on champagne
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2186">[ date ]</a>
<a href="thread.html#2186">[ thread ]</a>
<a href="subject.html#2186">[ subject ]</a>
<a href="author.html#2186">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 828
Author: boklm
Date: 2011-01-18 16:10:30 +0100 (Tue, 18 Jan 2011)
Log Message:
-----------
split mirror class in mirror::base and mirror::main
Modified Paths:
--------------
puppet/manifests/nodes.pp
puppet/modules/mirror/manifests/init.pp
Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp 2011-01-18 14:29:51 UTC (rev 827)
+++ puppet/manifests/nodes.pp 2011-01-18 15:10:30 UTC (rev 828)
@@ -11,7 +11,7 @@
include default_mageia_server
timezone::timezone { "Europe/Paris": }
include rsyncd
- include mirror
+ include mirror::main
include openldap::master
include subversion::client
include subversion::server
Modified: puppet/modules/mirror/manifests/init.pp
===================================================================
--- puppet/modules/mirror/manifests/init.pp 2011-01-18 14:29:51 UTC (rev 827)
+++ puppet/modules/mirror/manifests/init.pp 2011-01-18 15:10:30 UTC (rev 828)
@@ -1,40 +1,42 @@
class mirror {
+ class base {
+ file { "/home/mirror/bin/":
+ ensure => directory,
+ owner => mirror,
+ group => mirror,
+ mode => 755
+ }
- file { "update_timestamp":
- path => "/home/mirror/bin/update_timestamp",
- ensure => present,
- owner => mirror,
- group => mirror,
- mode => 755,
- content => template("mirror/update_timestamp")
- }
+ group {"mirror":
+ ensure => present,
+ }
- file { "/home/mirror/bin/":
- ensure => directory,
- owner => mirror,
- group => mirror,
- mode => 755
+ user {"mirror":
+ ensure => present,
+ comment => "System user use to run mirror scripts",
+ managehome => true,
+ gid => mirror,
+ shell => "/bin/bash",
+ }
}
- group {"mirror":
- ensure => present,
- }
+ # For main Mageia mirror
+ class main inherits base {
+ file { "update_timestamp":
+ path => "/home/mirror/bin/update_timestamp",
+ ensure => present,
+ owner => mirror,
+ group => mirror,
+ mode => 755,
+ content => template("mirror/update_timestamp")
+ }
- user {"mirror":
- ensure => present,
- comment => "System user use to run mirror scripts",
- managehome => true,
- gid => mirror,
- shell => "/bin/bash",
+ cron { mirror:
+ user => mirror,
+ hour => 10,
+ minute => 14,
+ command => "~mirror/bin/update_timestamp",
+ require => File["update_timestamp"],
+ }
}
-
-
- cron { mirror:
- user => mirror,
- hour => 10,
- minute => 14,
- command => "~mirror/bin/update_timestamp",
- require => File["update_timestamp"],
- }
-
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110118/40947b3a/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002185.html">[Mageia-sysadm] [317] Re-apply blino's fix
</A></li>
<LI>Next message: <A HREF="002187.html">[Mageia-sysadm] [829] start the migration of blogs on champagne
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2186">[ date ]</a>
<a href="thread.html#2186">[ thread ]</a>
<a href="subject.html#2186">[ subject ]</a>
<a href="author.html#2186">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|
