aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/templates
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2011-01-08 23:07:43 +0000
committerOlivier Blin <blino@mageia.org>2011-01-08 23:07:43 +0000
commitbccec2ff9b9e783492bfcc866517ab3c9998da50 (patch)
tree2625692b753b2aec187f590e7b11e1d4bda66a0b /modules/buildsystem/templates
parent85c3ade157867818d7c0c1c7e00ce994df2a3e51 (diff)
downloadpuppet-bccec2ff9b9e783492bfcc866517ab3c9998da50.tar
puppet-bccec2ff9b9e783492bfcc866517ab3c9998da50.tar.gz
puppet-bccec2ff9b9e783492bfcc866517ab3c9998da50.tar.bz2
puppet-bccec2ff9b9e783492bfcc866517ab3c9998da50.tar.xz
puppet-bccec2ff9b9e783492bfcc866517ab3c9998da50.zip
do not hardcode iurt login and home
Diffstat (limited to 'modules/buildsystem/templates')
-rw-r--r--modules/buildsystem/templates/iurt.cauldron.conf6
-rw-r--r--modules/buildsystem/templates/iurt.mandriva2010.1.conf6
-rw-r--r--modules/buildsystem/templates/upload.conf4
3 files changed, 8 insertions, 8 deletions
diff --git a/modules/buildsystem/templates/iurt.cauldron.conf b/modules/buildsystem/templates/iurt.cauldron.conf
index 05c79366..17496b89 100644
--- a/modules/buildsystem/templates/iurt.cauldron.conf
+++ b/modules/buildsystem/templates/iurt.cauldron.conf
@@ -1,11 +1,11 @@
{
supported_arch => [ 'i586', 'x86_64' ],
all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] },
- upload => 'iurt@pkgsubmit:~/uploads/',
- upload_queue => 'iurt@pkgsubmit:~/uploads/queue/',
+ upload => '<%= build_login %>@pkgsubmit:~/uploads/',
+ upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
unwanted_packages => '^monotone-',
repository => 'http://repository.<%= domain %>/distrib/',
- rsync_to => 'iurt@pkgsubmit:/mnt/BIG/dis/uploads/build/',
+ rsync_to => '<%= build_login %>@pkgsubmit:/mnt/BIG/dis/uploads/build/',
log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
admin => 'mageia-sysadm@mageia.org',
packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>',
diff --git a/modules/buildsystem/templates/iurt.mandriva2010.1.conf b/modules/buildsystem/templates/iurt.mandriva2010.1.conf
index a7cbecac..a0e26123 100644
--- a/modules/buildsystem/templates/iurt.mandriva2010.1.conf
+++ b/modules/buildsystem/templates/iurt.mandriva2010.1.conf
@@ -1,11 +1,11 @@
{
supported_arch => [ 'i586', 'x86_64' ],
all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] },
- upload => 'iurt@pkgsubmit:~/uploads/',
- upload_queue => 'iurt@pkgsubmit:~/uploads/queue/',
+ upload => '<%= build_login %>@pkgsubmit:~/uploads/',
+ upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
unwanted_packages => '^monotone-',
repository => 'http://repository.<%= domain %>/mandriva/',
- rsync_to => 'iurt@pkgsubmit:/mnt/BIG/dis/uploads/build/',
+ rsync_to => '<%= build_login %>@pkgsubmit:/mnt/BIG/dis/uploads/build/',
log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
admin => 'mageia-sysadm@mageia.org',
packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>',
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index ba4b704a..7d84bf2d 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -12,7 +12,7 @@ my %nodes = (
x86_64 => [ qw(jonund) ],
);
my $repository = "http://repository.<%= domain %>/distrib/";
-my $homedir = "/home/iurt";
+my $homedir = "<%= build_home_dir %>";
{
bot => {
@@ -23,7 +23,7 @@ my $homedir = "/home/iurt";
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__ -- file://$homedir/cache/ -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__",