aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/templates
diff options
context:
space:
mode:
Diffstat (limited to 'modules/buildsystem/templates')
-rw-r--r--modules/buildsystem/templates/iurt.conf2
-rw-r--r--modules/buildsystem/templates/upload.conf2
-rw-r--r--modules/buildsystem/templates/vhost_repository.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf
index f29f598b..ef67e567 100644
--- a/modules/buildsystem/templates/iurt.conf
+++ b/modules/buildsystem/templates/iurt.conf
@@ -11,7 +11,7 @@
upload => '<%= build_login %>@pkgsubmit:~/uploads/',
upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
unwanted_packages => '^monotone-',
- repository => 'http://repository.<%= domain %>/distrib/',
+ repository => 'http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/<%= scope.lookupvar('buildsystem::var::repository::distribdir') %>/',
log_url => 'http://<%= scope.lookupvar('buildsystem::var::webstatus::hostname') %>/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 73274c79..61b72d7f 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -11,7 +11,7 @@ my %nodes = (
i586 => [ qw(jonund0 ecosse0 jonund1 ecosse1) ],
x86_64 => [ qw(ecosse0 jonund0 ecosse1 jonund1) ],
);
-my $repository = "http://repository.<%= domain %>/distrib/";
+my $repository = "http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/<%= scope.lookupvar('buildsystem::var::repository::distribdir') %>/";
my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>";
{
diff --git a/modules/buildsystem/templates/vhost_repository.conf b/modules/buildsystem/templates/vhost_repository.conf
index 5992284f..cc0e437a 100644
--- a/modules/buildsystem/templates/vhost_repository.conf
+++ b/modules/buildsystem/templates/vhost_repository.conf
@@ -7,7 +7,7 @@ mirror_root = scope.lookupvar('buildsystem::var::repository::mirror_root')
%>
<VirtualHost *:80>
- ServerName repository.<%= @domain %>
+ ServerName <%= scope.lookupvar('buildsystem::var::repository::hostname') %>
DocumentRoot <%= mirror_root %>
Alias /distrib/infra_1/ "/distrib/bootstrap/distrib/infra_1/"
Alias /distrib/infra_2/ "/distrib/bootstrap/distrib/infra_2/"