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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [677] Adapt configs to Mageia mirror structure
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B677%5D%20Adapt%20configs%20to%20Mageia%20mirror%20structure&In-Reply-To=%3C20110106131801.96BB441A4D%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="001579.html">
<LINK REL="Next" HREF="001582.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [677] Adapt configs to Mageia mirror structure</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B677%5D%20Adapt%20configs%20to%20Mageia%20mirror%20structure&In-Reply-To=%3C20110106131801.96BB441A4D%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [677] Adapt configs to Mageia mirror structure">root at mageia.org
</A><BR>
<I>Thu Jan 6 14:18:01 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="001579.html">[Mageia-sysadm] [225] No need to sudo, emi is running with correct user already
</A></li>
<LI>Next message: <A HREF="001582.html">[Mageia-sysadm] [678] Do not request @mageia.org packager address for now
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1581">[ date ]</a>
<a href="thread.html#1581">[ thread ]</a>
<a href="subject.html#1581">[ subject ]</a>
<a href="author.html#1581">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 677
Author: pterjan
Date: 2011-01-06 14:18:01 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
Adapt configs to Mageia mirror structure
Modified Paths:
--------------
puppet/modules/buildsystem/templates/iurt.cauldron.conf
puppet/modules/buildsystem/templates/submit-todo.conf
puppet/modules/buildsystem/templates/upload.conf
Modified: puppet/modules/buildsystem/templates/iurt.cauldron.conf
===================================================================
--- puppet/modules/buildsystem/templates/iurt.cauldron.conf 2011-01-06 03:04:45 UTC (rev 676)
+++ puppet/modules/buildsystem/templates/iurt.cauldron.conf 2011-01-06 13:18:01 UTC (rev 677)
@@ -1,6 +1,6 @@
{
supported_arch => [ 'i586', 'x86_64' ],
- all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] },
+ all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] },
upload => '<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">iurt at pkgsubmit</A>:~/uploads/',
upload_queue => '<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">iurt at pkgsubmit</A>:~/uploads/queue/',
unwanted_packages => '^monotone-',
Modified: puppet/modules/buildsystem/templates/submit-todo.conf
===================================================================
--- puppet/modules/buildsystem/templates/submit-todo.conf 2011-01-06 03:04:45 UTC (rev 676)
+++ puppet/modules/buildsystem/templates/submit-todo.conf 2011-01-06 13:18:01 UTC (rev 677)
@@ -122,7 +122,7 @@
options:
1.0:
authorized_packages: none_package_authorized
- authorized_sections: main/testing|main/backports|contrib/testing|contrib/updates|contrib/backports|non-free/testing|non-free/updates|non-free/backports
+ authorized_sections: ^[a-z]+/(updates|testing|backports|backports_testing)$
authorized_arches: none
mode: freeze
Modified: puppet/modules/buildsystem/templates/upload.conf
===================================================================
--- puppet/modules/buildsystem/templates/upload.conf 2011-01-06 03:04:45 UTC (rev 676)
+++ puppet/modules/buildsystem/templates/upload.conf 2011-01-06 13:18:01 UTC (rev 677)
@@ -36,19 +36,33 @@
},
media => {
default => {
- "main/release" => [ "main/updates", "main/release" ],
- "main/updates" => [ "main/updates", "main/release" ],
- "main/testing" => [ "main/testing", "main/updates", "main/release" ],
- "main/backports" => [ "main/backports", "main/updates", "main/release" ],
- "contrib/release" => [ "main/updates", "main/release", "contrib/updates", "contrib/release" ],
- "contrib/updates" => [ "main/updates", "main/release", "contrib/updates", "contrib/release" ],
- "contrib/testing" => [ "main/updates", "main/release", "main/testing", "contrib/updates", "contrib/release", "contrib/testing" ],
- "contrib/backports" => [ "main/backports", "main/updates", "main/release", "contrib/backports", "contrib/updates", "contrib/release" ],
- # (blino) non-free packages may require contrib packages (gcc3.3-g77 for scilab)
- "non-free/release" => [ "main/updates", "main/release", "contrib/updates", "contrib/release", "non-free/updates", "non-free/release" ],
- "non-free/updates" => [ "main/updates", "main/release", "contrib/updates", "contrib/release", "non-free/updates", "non-free/release" ],
- "non-free/testing" => [ "main/updates", "main/release", "main/testing", "contrib/updates", "contrib/release", "contrib/testing", "non-free/updates", "non-free/release", "non-free/testing" ],
- "non-free/backports" => [ "main/backports", "main/release", "main/updates", "contrib/backports", "contrib/updates", "contrib/release", "non-free/backports", "non-free/updates", "non-free/release" ],
+ "core/release" => [ "core/updates", "core/release" ],
+ "core/updates" => [ "core/updates", "core/release" ],
+ "core/testing" => [ "core/testing", "core/updates", "core/release" ],
+ "core/backports" => [ "core/backports", "core/testing", "core/updates", "core/release" ],
+ "core/backports_testing" => [ "core/backports_testing", "core/backports", "core/testing", "core/updates", "core/release" ],
+ "nonfree/release" => [ "core/release", "nonfree/release" ],
+ "nonfree/updates" => [ "core/updates", "core/release", "nonfree/release", "nonfree/updates" ],
+ "nonfree/testing" => [ "core/updates", "core/release", "core/testing", "nonfree/release", "nonfree/updates", "nonfree/testing" ],
+ "nonfree/backports" => [ "core/backports", "core/testing", "core/updates", "core/release",
+ "nonfree/release", "nonfree/updates", "nonfree/testing", "nonfree/backports" ],
+ "nonfree/backports_testing" => [ "core/backports_testing", "core/backports", "core/testing", "core/updates", "core/release",
+ "nonfree/release", "nonfree/updates", "nonfree/testing", "nonfree/backports", "nonfree/backports_testing" ],
+ "tainted/release" => [ "core/release", "nonfree/release", "tainted/release" ],
+ "tainted/updates" => [ "core/release", "nonfree/release", "tainted/release",
+ "core/updates", "nonfree/updates", "tainted/updates" ],
+ "tainted/testing" => [ "core/release", "nonfree/release", "tainted/release",
+ "core/updates", "nonfree/updates", "tainted/updates",
+ "core/testing", "nonfree/testing", "tainted/testing" ],
+ "tainted/backports" => [ "core/release", "nonfree/release", "tainted/release",
+ "core/updates", "nonfree/updates", "tainted/updates",
+ "core/testing", "nonfree/testing", "tainted/testing",
+ "core/backports", "nonfree/backports", "tainted/backports" ],
+ "tainted/backports_testing" => [ "core/release", "nonfree/release", "tainted/release",
+ "core/updates", "nonfree/updates", "tainted/updates",
+ "core/testing", "nonfree/testing", "tainted/testing",
+ "core/backports", "nonfree/backports", "tainted/backports",
+ "core/backports_testing", "nonfree/backports_testing", "tainted/backports_testing" ],
},
},
admin => '<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">mageia-sysadm at mageia.org</A>',
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110106/6411a4ea/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001579.html">[Mageia-sysadm] [225] No need to sudo, emi is running with correct user already
</A></li>
<LI>Next message: <A HREF="001582.html">[Mageia-sysadm] [678] Do not request @mageia.org packager address for now
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1581">[ date ]</a>
<a href="thread.html#1581">[ thread ]</a>
<a href="subject.html#1581">[ subject ]</a>
<a href="author.html#1581">[ 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>
|
