aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-01-06 00:06:30 +0000
committerMichael Scherer <misc@mageia.org>2011-01-06 00:06:30 +0000
commited5823e8c11f4cb7be4c9c3fda27014922c0efb5 (patch)
treead7e35558fcf220717f207c63195645ed27bcd48 /modules/buildsystem
parenta7df0a4bc603cd4bd11f219dbf2c249e45d4cacd (diff)
downloadpuppet-ed5823e8c11f4cb7be4c9c3fda27014922c0efb5.tar
puppet-ed5823e8c11f4cb7be4c9c3fda27014922c0efb5.tar.gz
puppet-ed5823e8c11f4cb7be4c9c3fda27014922c0efb5.tar.bz2
puppet-ed5823e8c11f4cb7be4c9c3fda27014922c0efb5.tar.xz
puppet-ed5823e8c11f4cb7be4c9c3fda27014922c0efb5.zip
- do not hardcode domain name ( as this complexify deploymement on a separate
test set of server )
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/templates/iurt.cauldron.conf4
-rw-r--r--modules/buildsystem/templates/iurt.mandriva2010.1.conf4
-rw-r--r--modules/buildsystem/templates/upload.conf4
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/buildsystem/templates/iurt.cauldron.conf b/modules/buildsystem/templates/iurt.cauldron.conf
index 153f4411..aeb599ae 100644
--- a/modules/buildsystem/templates/iurt.cauldron.conf
+++ b/modules/buildsystem/templates/iurt.cauldron.conf
@@ -4,9 +4,9 @@
upload => 'iurt@pkgsubmit:~/uploads/',
upload_queue => 'iurt@pkgsubmit:~/uploads/queue/',
unwanted_packages => '^monotone-',
- repository => 'http://repository.mageia.org/distrib/',
+ repository => 'http://repository.<%= domain %>/distrib/',
rsync_to => 'iurt@pkgsubmit:/mnt/BIG/dis/uploads/build/',
- log_url => 'http://pkgsubmit.mageia.org/queue/build/',
+ log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
admin => 'mageia-sysadm@mageia.org',
packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>',
sendmail => 0,
diff --git a/modules/buildsystem/templates/iurt.mandriva2010.1.conf b/modules/buildsystem/templates/iurt.mandriva2010.1.conf
index 9de3c50c..a7cbecac 100644
--- a/modules/buildsystem/templates/iurt.mandriva2010.1.conf
+++ b/modules/buildsystem/templates/iurt.mandriva2010.1.conf
@@ -4,9 +4,9 @@
upload => 'iurt@pkgsubmit:~/uploads/',
upload_queue => 'iurt@pkgsubmit:~/uploads/queue/',
unwanted_packages => '^monotone-',
- repository => 'http://repository.mageia.org/mandriva/',
+ repository => 'http://repository.<%= domain %>/mandriva/',
rsync_to => 'iurt@pkgsubmit:/mnt/BIG/dis/uploads/build/',
- log_url => 'http://pkgsubmit.mageia.org/queue/build/',
+ log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
admin => 'mageia-sysadm@mageia.org',
packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>',
sendmail => 0,
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index 9531dc01..93ed5d8e 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -11,7 +11,7 @@ my %nodes = (
i586 => [ qw(ecosse) ],
x86_64 => [ qw(jonund) ],
);
-my $repository = "http://repository.mageia.org/distrib/";
+my $repository = "http://repository.<%= domain %>/distrib/";
my $homedir = "/home/iurt";
{
@@ -52,6 +52,6 @@ my $homedir = "/home/iurt";
},
},
admin => 'mageia-sysadm@mageia.org',
- http_queue => 'http://pkgsubmit.mageia.org/uploads',
+ http_queue => 'http://pkgsubmit.<%= domain %>/uploads',
upload_user => 'schedbot',
}