diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:02 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:02 +0000 |
| commit | e8ed74b839b0cf72550dff89138a4dca8b544900 (patch) | |
| tree | 7022fbfa6a94c5b77ef1ff30c6f2bdc71779fb8d /modules/buildsystem | |
| parent | b20c4921246411a27afb95369fcf59d756f82434 (diff) | |
| download | puppet-e8ed74b839b0cf72550dff89138a4dca8b544900.tar puppet-e8ed74b839b0cf72550dff89138a4dca8b544900.tar.gz puppet-e8ed74b839b0cf72550dff89138a4dca8b544900.tar.bz2 puppet-e8ed74b839b0cf72550dff89138a4dca8b544900.tar.xz puppet-e8ed74b839b0cf72550dff89138a4dca8b544900.zip | |
buildsystem/upload.conf: use webstatus config
Use the variable from webstatus configuration to set URL in upload.conf
instead of hardcoding pkgsubmit.$domain.
Diffstat (limited to 'modules/buildsystem')
| -rw-r--r-- | modules/buildsystem/manifests/iurt/upload.pp | 1 | ||||
| -rw-r--r-- | modules/buildsystem/templates/upload.conf | 2 |
2 files changed, 2 insertions, 1 deletions
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 %>', } |