diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-22 22:17:07 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-22 22:17:07 +0000 |
| commit | 067cd148803254549efe8cd7e83533ddab8eebe0 (patch) | |
| tree | e3f502bd3678e9ec001206e857802a861760487f /modules | |
| parent | 146e97ccbd887c288e8642de9675e100ce28d0c2 (diff) | |
| download | puppet-067cd148803254549efe8cd7e83533ddab8eebe0.tar puppet-067cd148803254549efe8cd7e83533ddab8eebe0.tar.gz puppet-067cd148803254549efe8cd7e83533ddab8eebe0.tar.bz2 puppet-067cd148803254549efe8cd7e83533ddab8eebe0.tar.xz puppet-067cd148803254549efe8cd7e83533ddab8eebe0.zip | |
buildsystem::binrepo: add option to select binrepo hostname
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/manifests/binrepo.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/mgarepo.pp | 1 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/var/binrepo.pp | 1 | ||||
| -rw-r--r-- | modules/buildsystem/templates/mgarepo.conf | 5 |
4 files changed, 6 insertions, 3 deletions
diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp index 861987ee..10027515 100644 --- a/modules/buildsystem/manifests/binrepo.pp +++ b/modules/buildsystem/manifests/binrepo.pp @@ -24,7 +24,7 @@ class buildsystem::binrepo { content => template('buildsystem/binrepo/sudoers.binrepo') } - apache::vhost::base { "binrepo.${::domain}": + apache::vhost::base { $buildsystem::var::binrepo::hostname: location => $buildsystem::var::binrepo::repodir, content => template('buildsystem/binrepo/vhost_binrepo.conf'), } diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp index eda9f1ee..47cac021 100644 --- a/modules/buildsystem/manifests/mgarepo.pp +++ b/modules/buildsystem/manifests/mgarepo.pp @@ -1,6 +1,7 @@ class buildsystem::mgarepo { include buildsystem::var::scheduler include buildsystem::var::groups + include buildsystem::var::binrepo $sched_login = $buildsystem::var::scheduler::login $sched_home_dir = $buildsystem::var::scheduler::homedir diff --git a/modules/buildsystem/manifests/var/binrepo.pp b/modules/buildsystem/manifests/var/binrepo.pp index d734c216..0b9c0f35 100644 --- a/modules/buildsystem/manifests/var/binrepo.pp +++ b/modules/buildsystem/manifests/var/binrepo.pp @@ -3,6 +3,7 @@ # $uploadmail_to: # where binrepo email notifications are sent class buildsystem::var::binrepo( + $hostname = "binrepo.${::domain}", $login = 'binrepo', $homedir = '/var/lib/binrepo', $uploadmail_from, diff --git a/modules/buildsystem/templates/mgarepo.conf b/modules/buildsystem/templates/mgarepo.conf index c4dd0855..e46ae2fa 100644 --- a/modules/buildsystem/templates/mgarepo.conf +++ b/modules/buildsystem/templates/mgarepo.conf @@ -95,6 +95,7 @@ upload-bin = /usr/local/bin/wrapper.upload-bin run-prep = yes [binrepo] -download_url = http://binrepo.<%= domain %>/ -upload_host = binrepo.<%= domain %> +<%- binrepo_hostname = scope.lookupvar('buildsystem::var::binrepo::hostname') -%> +download_url = http://<%= binrepo_hostname %>/ +upload_host = <%= binrepo_hostname %> |