buildsystem: add options to select webstatus location

2 files changed, 5 insertions, 5 deletions

diff --git a/modules/buildsystem/manifests/var/webstatus.pp b/modules/buildsystem/manifests/var/webstatus.pp
index fb85fb3e..20f8013c 100644
--- a/modules/buildsystem/manifests/var/webstatus.pp
+++ b/modules/buildsystem/manifests/var/webstatus.pp
@@ -1,5 +1,6 @@
 class buildsystem::var::webstatus(
     $svn_url = "svn://svn.mageia.org/soft/buildsystem/web/",
-    $hostname = "pkgsubmit.$::domain"
+    $hostname = "pkgsubmit.$::domain",
+    $location = '/var/www/bs'
 ) {
 }
diff --git a/modules/buildsystem/manifests/webstatus.pp b/modules/buildsystem/manifests/webstatus.pp
index 584e3e99..d263cc2f 100644
--- a/modules/buildsystem/manifests/webstatus.pp
+++ b/modules/buildsystem/manifests/webstatus.pp
@@ -3,8 +3,7 @@ class buildsystem::webstatus {
     include buildsystem::var::scheduler
     $sched_home_dir = $buildsystem::var::scheduler::homedir
 
-    $location = '/var/www/bs'
-    file { [$location,"$location/data"]:
+    file { [ $buildsystem::var::webstatus::location, "${buildsystem::var::webstatus::location}/data" ]:
         ensure => directory,
     }
 
@@ -13,11 +12,11 @@ class buildsystem::webstatus {
             '/uploads' => "$sched_home_dir/uploads",
             '/autobuild/cauldron/x86_64/core/log/status.core.log' => "$location/autobuild/broken.php"
         },
-        location => $location,
+        location => $buildsystem::var::webstatus::location,
         content  => template('buildsystem/vhost_webstatus.conf'),
     }
 
-    subversion::snapshot { $location:
+    subversion::snapshot { $buildsystem::var::webstatus::location:
         source => $buildsystem::var::webstatus::svn_url,
     }
 }