summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2011-January/002215.html
blob: 964d283d2710f74947c1b5ff32546c2bc4af97c0 (plain)
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
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [841] add mirrordir script and mirrorbootstrap class
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B841%5D%20add%20mirrordir%20script%20and%20mirrorbootstrap%20class&In-Reply-To=%3C20110118182144.A61A442935%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="002214.html">
   <LINK REL="Next"  HREF="002216.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [841] add mirrordir script and mirrorbootstrap class</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B841%5D%20add%20mirrordir%20script%20and%20mirrorbootstrap%20class&In-Reply-To=%3C20110118182144.A61A442935%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [841] add mirrordir script and mirrorbootstrap class">root at mageia.org
       </A><BR>
    <I>Tue Jan 18 19:21:44 CET 2011</I>
    <P><UL>
        <LI>Previous message: <A HREF="002214.html">[Mageia-sysadm] [840] fix the vhost for all locales
</A></li>
        <LI>Next message: <A HREF="002216.html">[Mageia-sysadm] [842] mirror bootstrap on rabbit
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#2215">[ date ]</a>
              <a href="thread.html#2215">[ thread ]</a>
              <a href="subject.html#2215">[ subject ]</a>
              <a href="author.html#2215">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 841
Author:   boklm
Date:     2011-01-18 19:21:44 +0100 (Tue, 18 Jan 2011)
Log Message:
-----------
add mirrordir script and mirrorbootstrap class

Modified Paths:
--------------
    puppet/modules/mirror/manifests/init.pp

Added Paths:
-----------
    puppet/modules/mirror/templates/mirrordir

Modified: puppet/modules/mirror/manifests/init.pp
===================================================================
--- puppet/modules/mirror/manifests/init.pp	2011-01-18 18:03:15 UTC (rev 840)
+++ puppet/modules/mirror/manifests/init.pp	2011-01-18 18:21:44 UTC (rev 841)
@@ -1,6 +1,7 @@
 class mirror {
     class base {
 	$bindir = '/home/mirror/bin'
+	$locksdir = '/home/mirror/locks'
 	file { &quot;$bindir&quot;:
 	    ensure =&gt; directory,
             owner =&gt; mirror,
@@ -8,6 +9,13 @@
 	    mode =&gt; 755
 	}
 
+	file { &quot;$locksdir&quot;:
+	    ensure =&gt; directory,
+            owner =&gt; mirror,
+	    group =&gt; mirror,
+	    mode =&gt; 755
+	}
+
 	group {&quot;mirror&quot;:
 	    ensure =&gt; present,
 	}
@@ -21,8 +29,15 @@
 	}
     }
 
-    define mirrordir ($remotehost, $remotedir, $localdir) {
+    define mirrordir ($remoteurl, $localdir, $rsync_options=&quot;-avH --delete&quot;) {
     	include base
+	lockfile=&quot;$locksdir/$name&quot;
+	file { &quot;$localdir&quot;:
+	    ensure =&gt; directory,
+            owner =&gt; mirror,
+	    group =&gt; mirror,
+	    mode =&gt; 755,
+	}
     	file { &quot;mirror_$name&quot;:
 	    path =&gt; &quot;$bindir/$name&quot;,
 	    ensure =&gt; present,
@@ -59,4 +74,11 @@
 	    require =&gt; File[&quot;update_timestamp&quot;],
 	}
     }
+
+    class mirrorbootstrap inherits base {
+    	mirrordir { &quot;bootstrap&quot;:
+	    remoteurl =&gt; '<A HREF="rsync://valstar.mageia.org/bootstrap">rsync://valstar.mageia.org/bootstrap</A>',
+	    localdir =&gt; '/distrib/bootstrap',
+	}
+    }
 }

Added: puppet/modules/mirror/templates/mirrordir
===================================================================
--- puppet/modules/mirror/templates/mirrordir	                        (rev 0)
+++ puppet/modules/mirror/templates/mirrordir	2011-01-18 18:21:44 UTC (rev 841)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+remoteurl=&quot;&lt;%= remoteurl%&gt;&quot;
+localdir=&quot;&lt;%= localdir %&gt;&quot;
+rsync_options=&quot;&lt;%= rsync_options %&gt;&quot;
+lockfile=&quot;&lt;%= lockfile %&gt;&quot;
+
+test -f &quot;$lockfile&quot; &amp;&amp; exit
+touch &quot;$lockfile&quot;
+/usr/bin/rsync $rsync_options &quot;$remoteurl&quot; &quot;$localdir&quot;
+rm -f &quot;$lockfile&quot;
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20110118/add3e5f5/attachment.html&gt;
</PRE>











<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="002214.html">[Mageia-sysadm] [840] fix the vhost for all locales
</A></li>
	<LI>Next message: <A HREF="002216.html">[Mageia-sysadm] [842] mirror bootstrap on rabbit
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#2215">[ date ]</a>
              <a href="thread.html#2215">[ thread ]</a>
              <a href="subject.html#2215">[ subject ]</a>
              <a href="author.html#2215">[ 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>