diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-30 20:44:07 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-30 20:44:07 +0000 |
| commit | 4348d8c7c3d3f0c638126e16c20c69e13a89fd3b (patch) | |
| tree | c814c52b4cce10841e418e0472b1c86a9bb24bd6 | |
| parent | a55287703eba787e9c8db27800b7ee0042fabee0 (diff) | |
| download | puppet-4348d8c7c3d3f0c638126e16c20c69e13a89fd3b.tar puppet-4348d8c7c3d3f0c638126e16c20c69e13a89fd3b.tar.gz puppet-4348d8c7c3d3f0c638126e16c20c69e13a89fd3b.tar.bz2 puppet-4348d8c7c3d3f0c638126e16c20c69e13a89fd3b.tar.xz puppet-4348d8c7c3d3f0c638126e16c20c69e13a89fd3b.zip | |
buildsystem: Add iurt_use_bootstrap option for distros
Option to select wether iurt should use bootstrap URL for medias.
| -rw-r--r-- | modules/buildsystem/manifests/var/distros.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/templates/iurt.conf | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index 7bb16cfb..f97ad8b2 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -69,6 +69,8 @@ # 'distribution' => 'Mageia', # 'vendor' => 'Mageia.Org', # }, +# # set this if you want iurt to use bootstrap URL +# 'iurt_use_bootstrap' => true, # # list of IP or hostnames allowed to access this distro on the # # repository. If you don't want to filter allowed IPs, don't set # # this value diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf index 34809afa..4cf34898 100644 --- a/modules/buildsystem/templates/iurt.conf +++ b/modules/buildsystem/templates/iurt.conf @@ -14,7 +14,11 @@ upload => '<%= build_login %>@pkgsubmit:~/uploads/', upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', unwanted_packages => '^monotone-', +<%- if distro['iurt_use_bootstrap'] -%> + repository => 'http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/bootstrap/', +<%- else -%> repository => 'http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/<%= scope.lookupvar('buildsystem::var::repository::distribdir') %>/', +<%- end -%> 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>', |