From 859f77cb4bd45be7dbcecdf8f2d842a766b0728b Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Thu, 23 May 2013 15:04:28 +0000
Subject: Add buildsystem::var::webstatus

Make vhost and svn url configurable by adding buildsystem::var::webstatus.
---
 modules/buildsystem/manifests/var/webstatus.pp | 5 +++++
 modules/buildsystem/manifests/webstatus.pp     | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 modules/buildsystem/manifests/var/webstatus.pp

(limited to 'modules/buildsystem')

diff --git a/modules/buildsystem/manifests/var/webstatus.pp b/modules/buildsystem/manifests/var/webstatus.pp
new file mode 100644
index 00000000..fb85fb3e
--- /dev/null
+++ b/modules/buildsystem/manifests/var/webstatus.pp
@@ -0,0 +1,5 @@
+class buildsystem::var::webstatus(
+    $svn_url = "svn://svn.mageia.org/soft/buildsystem/web/",
+    $hostname = "pkgsubmit.$::domain"
+) {
+}
diff --git a/modules/buildsystem/manifests/webstatus.pp b/modules/buildsystem/manifests/webstatus.pp
index 9ed617ed..584e3e99 100644
--- a/modules/buildsystem/manifests/webstatus.pp
+++ b/modules/buildsystem/manifests/webstatus.pp
@@ -1,4 +1,5 @@
 class buildsystem::webstatus {
+    include buildsystem::var::webstatus
     include buildsystem::var::scheduler
     $sched_home_dir = $buildsystem::var::scheduler::homedir
 
@@ -7,7 +8,7 @@ class buildsystem::webstatus {
         ensure => directory,
     }
 
-    apache::vhost::base { "pkgsubmit.$::domain":
+    apache::vhost::base { $buildsystem::var::webstatus::hostname:
         aliases  => {
             '/uploads' => "$sched_home_dir/uploads",
             '/autobuild/cauldron/x86_64/core/log/status.core.log' => "$location/autobuild/broken.php"
@@ -17,6 +18,6 @@ class buildsystem::webstatus {
     }
 
     subversion::snapshot { $location:
-        source => "svn://svn.$::domain/soft/buildsystem/web/",
+        source => $buildsystem::var::webstatus::svn_url,
     }
 }
-- 
cgit v1.2.1