summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2011-January/002358.html
blob: fc3c97cc8f668a180fe8293692daa4ba12807518 (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
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [875] deploy our README on the mirror
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B875%5D%20deploy%20our%20README%20on%20the%20mirror&In-Reply-To=%3C20110121141620.5ABA642C80%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="002357.html">
   <LINK REL="Next"  HREF="002361.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [875] deploy our README on the mirror</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B875%5D%20deploy%20our%20README%20on%20the%20mirror&In-Reply-To=%3C20110121141620.5ABA642C80%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [875] deploy our README on the mirror">root at mageia.org
       </A><BR>
    <I>Fri Jan 21 15:16:20 CET 2011</I>
    <P><UL>
        <LI>Previous message: <A HREF="002357.html">[Mageia-sysadm] [874] add some documentation on path
</A></li>
        <LI>Next message: <A HREF="002361.html">[Mageia-sysadm] [876] fix error in url (noticed by jq)
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#2358">[ date ]</a>
              <a href="thread.html#2358">[ thread ]</a>
              <a href="subject.html#2358">[ subject ]</a>
              <a href="author.html#2358">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 875
Author:   misc
Date:     2011-01-21 15:16:20 +0100 (Fri, 21 Jan 2011)
Log Message:
-----------
deploy our README on the mirror

Modified Paths:
--------------
    puppet/deployment/main_mirror/manifests/init.pp
    puppet/manifests/nodes.pp

Modified: puppet/deployment/main_mirror/manifests/init.pp
===================================================================
--- puppet/deployment/main_mirror/manifests/init.pp	2011-01-21 14:10:27 UTC (rev 874)
+++ puppet/deployment/main_mirror/manifests/init.pp	2011-01-21 14:16:20 UTC (rev 875)
@@ -1,4 +1,7 @@
 class main_mirror {
+    # FIXME shouldn't the various code in this module ?
+    include mirror::main
+
     $mirror = &quot;/distrib&quot;
     file { &quot;$mirror&quot;:
         ensure =&gt; directory,

Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp	2011-01-21 14:10:27 UTC (rev 874)
+++ puppet/manifests/nodes.pp	2011-01-21 14:16:20 UTC (rev 875)
@@ -11,7 +11,7 @@
     include default_mageia_server
     timezone::timezone { &quot;Europe/Paris&quot;: }
     include rsyncd
-    include mirror::main
+    include main_mirror
     include openldap::master 
     include subversion::client
     include subversion::server
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20110121/11fc3364/attachment.html&gt;
</PRE>














<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="002357.html">[Mageia-sysadm] [874] add some documentation on path
</A></li>
	<LI>Next message: <A HREF="002361.html">[Mageia-sysadm] [876] fix error in url (noticed by jq)
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#2358">[ date ]</a>
              <a href="thread.html#2358">[ thread ]</a>
              <a href="subject.html#2358">[ subject ]</a>
              <a href="author.html#2358">[ 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>