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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [830] - add mirrordir define
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B830%5D%20%20-%20add%20mirrordir%20define&In-Reply-To=%3C20110118165059.8291E42907%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="002187.html">
<LINK REL="Next" HREF="002189.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [830] - add mirrordir define</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B830%5D%20%20-%20add%20mirrordir%20define&In-Reply-To=%3C20110118165059.8291E42907%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [830] - add mirrordir define">root at mageia.org
</A><BR>
<I>Tue Jan 18 17:50:59 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002187.html">[Mageia-sysadm] [829] start the migration of blogs on champagne
</A></li>
<LI>Next message: <A HREF="002189.html">[Mageia-sysadm] [831] add the vhost for blogs
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2188">[ date ]</a>
<a href="thread.html#2188">[ thread ]</a>
<a href="subject.html#2188">[ subject ]</a>
<a href="author.html#2188">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 830
Author: boklm
Date: 2011-01-18 17:50:59 +0100 (Tue, 18 Jan 2011)
Log Message:
-----------
- add mirrordir define
- use $bindir variable
- scripts owned by root:root
Modified Paths:
--------------
puppet/modules/mirror/manifests/init.pp
Modified: puppet/modules/mirror/manifests/init.pp
===================================================================
--- puppet/modules/mirror/manifests/init.pp 2011-01-18 16:31:36 UTC (rev 829)
+++ puppet/modules/mirror/manifests/init.pp 2011-01-18 16:50:59 UTC (rev 830)
@@ -1,6 +1,7 @@
class mirror {
class base {
- file { "/home/mirror/bin/":
+ $bindir = '/home/mirror/bin'
+ file { "$bindir":
ensure => directory,
owner => mirror,
group => mirror,
@@ -20,13 +21,32 @@
}
}
+ define mirrordir ($remotehost, $remotedir, $localdir) {
+ include base
+ file { "mirror_$name":
+ path => "$bindir/$name",
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 755,
+ content => template("mirror/mirrordir"),
+ }
+
+ cron { "mirror_$name":
+ user => mirror,
+ minute => [0, 10, 20, 30, 40, 50],
+ command => "$bindir/$name",
+ require => File["$name"],
+ }
+ }
+
# For main Mageia mirror
class main inherits base {
file { "update_timestamp":
- path => "/home/mirror/bin/update_timestamp",
+ path => "$bindir/update_timestamp",
ensure => present,
- owner => mirror,
- group => mirror,
+ owner => root,
+ group => root,
mode => 755,
content => template("mirror/update_timestamp")
}
@@ -35,7 +55,7 @@
user => mirror,
hour => 10,
minute => 14,
- command => "~mirror/bin/update_timestamp",
+ command => "$bindir/update_timestamp",
require => File["update_timestamp"],
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110118/a10498e8/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002187.html">[Mageia-sysadm] [829] start the migration of blogs on champagne
</A></li>
<LI>Next message: <A HREF="002189.html">[Mageia-sysadm] [831] add the vhost for blogs
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2188">[ date ]</a>
<a href="thread.html#2188">[ thread ]</a>
<a href="subject.html#2188">[ subject ]</a>
<a href="author.html#2188">[ 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>
|
