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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [734] do not hardcode iurt login and home
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B734%5D%20do%20not%20hardcode%20iurt%20login%20and%20home&In-Reply-To=%3C20110108230743.5920B41D75%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="001795.html">
<LINK REL="Next" HREF="001797.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [734] do not hardcode iurt login and home</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B734%5D%20do%20not%20hardcode%20iurt%20login%20and%20home&In-Reply-To=%3C20110108230743.5920B41D75%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [734] do not hardcode iurt login and home">root at mageia.org
</A><BR>
<I>Sun Jan 9 00:07:43 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="001795.html">[Mageia-sysadm] [733] do not harccode schedbot login
</A></li>
<LI>Next message: <A HREF="001797.html">[Mageia-sysadm] [735] use /var/www/bs as new root
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1796">[ date ]</a>
<a href="thread.html#1796">[ thread ]</a>
<a href="subject.html#1796">[ subject ]</a>
<a href="author.html#1796">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 734
Author: blino
Date: 2011-01-09 00:07:43 +0100 (Sun, 09 Jan 2011)
Log Message:
-----------
do not hardcode iurt login and home
Modified Paths:
--------------
puppet/modules/buildsystem/templates/iurt.cauldron.conf
puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf
puppet/modules/buildsystem/templates/upload.conf
Modified: puppet/modules/buildsystem/templates/iurt.cauldron.conf
===================================================================
--- puppet/modules/buildsystem/templates/iurt.cauldron.conf 2011-01-08 23:03:24 UTC (rev 733)
+++ puppet/modules/buildsystem/templates/iurt.cauldron.conf 2011-01-08 23:07:43 UTC (rev 734)
@@ -1,11 +1,11 @@
{
supported_arch => [ 'i586', 'x86_64' ],
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/',
+ upload => '<%= build_login %>@pkgsubmit:~/uploads/',
+ upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
unwanted_packages => '^monotone-',
repository => '<A HREF="http://repository.<%=">http://repository.<%=</A> domain %>/distrib/',
- rsync_to => '<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">iurt at pkgsubmit</A>:/mnt/BIG/dis/uploads/build/',
+ rsync_to => '<%= build_login %>@pkgsubmit:/mnt/BIG/dis/uploads/build/',
log_url => '<A HREF="http://pkgsubmit.<%=">http://pkgsubmit.<%=</A> domain %>/queue/build/',
admin => '<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">mageia-sysadm at mageia.org</A>',
packager => 'Iurt the rebuild bot <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">mageia-sysadm at mageia.org</A>>',
Modified: puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf
===================================================================
--- puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf 2011-01-08 23:03:24 UTC (rev 733)
+++ puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf 2011-01-08 23:07:43 UTC (rev 734)
@@ -1,11 +1,11 @@
{
supported_arch => [ 'i586', 'x86_64' ],
all_media => { 'main' => [ 'release' ], 'contrib' => [ '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/',
+ upload => '<%= build_login %>@pkgsubmit:~/uploads/',
+ upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
unwanted_packages => '^monotone-',
repository => '<A HREF="http://repository.<%=">http://repository.<%=</A> domain %>/mandriva/',
- rsync_to => '<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">iurt at pkgsubmit</A>:/mnt/BIG/dis/uploads/build/',
+ rsync_to => '<%= build_login %>@pkgsubmit:/mnt/BIG/dis/uploads/build/',
log_url => '<A HREF="http://pkgsubmit.<%=">http://pkgsubmit.<%=</A> domain %>/queue/build/',
admin => '<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">mageia-sysadm at mageia.org</A>',
packager => 'Iurt the rebuild bot <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">mageia-sysadm at mageia.org</A>>',
Modified: puppet/modules/buildsystem/templates/upload.conf
===================================================================
--- puppet/modules/buildsystem/templates/upload.conf 2011-01-08 23:03:24 UTC (rev 733)
+++ puppet/modules/buildsystem/templates/upload.conf 2011-01-08 23:07:43 UTC (rev 734)
@@ -12,7 +12,7 @@
x86_64 => [ qw(jonund) ],
);
my $repository = "<A HREF="http://repository.<%=">http://repository.<%=</A> domain %>/distrib/";
-my $homedir = "/home/iurt";
+my $homedir = "<%= build_home_dir %>";
{
bot => {
@@ -23,7 +23,7 @@
my $node = $_;
($node => {
iurt => {
- user => 'iurt',
+ user => '<%= build_login %>',
# (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind
# command => "iurt --copy-srpm --group -v 6 --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository --additional-media -m __MEDIA__ -- <A HREF="file://$homedir/cache/">file://$homedir/cache/</A> -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
command => "iurt --copy_srpm --group -v 6 --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110109/db50235f/attachment-0001.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001795.html">[Mageia-sysadm] [733] do not harccode schedbot login
</A></li>
<LI>Next message: <A HREF="001797.html">[Mageia-sysadm] [735] use /var/www/bs as new root
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1796">[ date ]</a>
<a href="thread.html#1796">[ thread ]</a>
<a href="subject.html#1796">[ subject ]</a>
<a href="author.html#1796">[ 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>
|
