From e8ed74b839b0cf72550dff89138a4dca8b544900 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Thu, 23 May 2013 15:05:02 +0000 Subject: buildsystem/upload.conf: use webstatus config Use the variable from webstatus configuration to set URL in upload.conf instead of hardcoding pkgsubmit.$domain. --- modules/buildsystem/manifests/iurt/upload.pp | 1 + modules/buildsystem/templates/upload.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/buildsystem/manifests/iurt/upload.pp b/modules/buildsystem/manifests/iurt/upload.pp index 94921223..6aaef201 100644 --- a/modules/buildsystem/manifests/iurt/upload.pp +++ b/modules/buildsystem/manifests/iurt/upload.pp @@ -1,5 +1,6 @@ class buildsystem::iurt::upload { include buildsystem::var::iurt + include buildsystem::var::webstatus file { '/etc/iurt/upload.conf': require => File['/etc/iurt'], content => template('buildsystem/upload.conf'), diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf index 30e02f35..73274c79 100644 --- a/modules/buildsystem/templates/upload.conf +++ b/modules/buildsystem/templates/upload.conf @@ -67,7 +67,7 @@ my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>"; }, }, admin => 'mageia-sysadm@mageia.org', - http_queue => 'http://pkgsubmit.<%= domain %>/uploads', + http_queue => 'http://<%= scope.lookupvar('buildsystem::var::webstatus::hostname') %>/uploads', upload_user => '<%= scope.lookupvar('buildsystem::var::scheduler::login') %>', email_domain => '<%= domain %>', } -- cgit v1.2.1