aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:17 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:17 +0000
commit6d476b74ea5bae95c4a106d2b2df9a48aa9c5eec (patch)
tree8adc74eafa8225aa953a795d705a0e0d5bdaf8c9 /modules/buildsystem
parentaba1e422bad0d471063bcea9090ebb3d398f8ab3 (diff)
downloadpuppet-6d476b74ea5bae95c4a106d2b2df9a48aa9c5eec.tar
puppet-6d476b74ea5bae95c4a106d2b2df9a48aa9c5eec.tar.gz
puppet-6d476b74ea5bae95c4a106d2b2df9a48aa9c5eec.tar.bz2
puppet-6d476b74ea5bae95c4a106d2b2df9a48aa9c5eec.tar.xz
puppet-6d476b74ea5bae95c4a106d2b2df9a48aa9c5eec.zip
buildsystem: use webstatus hostname config in iurt.conf
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/manifests/iurt/config.pp1
-rw-r--r--modules/buildsystem/templates/iurt.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp
index 1a86a9e4..54bc03ea 100644
--- a/modules/buildsystem/manifests/iurt/config.pp
+++ b/modules/buildsystem/manifests/iurt/config.pp
@@ -1,5 +1,6 @@
define buildsystem::iurt::config() {
include buildsystem::var::iurt
+ include buildsystem::var::webstatus
$distribution = $name
# TODO rename the variable too in template
$build_login = $buildsystem::var::iurt::login
diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf
index 0f29e525..3b71bb49 100644
--- a/modules/buildsystem/templates/iurt.conf
+++ b/modules/buildsystem/templates/iurt.conf
@@ -12,7 +12,7 @@
upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
unwanted_packages => '^monotone-',
repository => 'http://repository.<%= domain %>/distrib/',
- log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
+ 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>',
sendmail => 0,