From 067cd148803254549efe8cd7e83533ddab8eebe0 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Wed, 22 May 2013 22:17:07 +0000
Subject: buildsystem::binrepo: add option to select binrepo hostname

---
 modules/buildsystem/manifests/binrepo.pp     | 2 +-
 modules/buildsystem/manifests/mgarepo.pp     | 1 +
 modules/buildsystem/manifests/var/binrepo.pp | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/buildsystem/manifests')

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,
-- 
cgit v1.2.1