aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-23 15:04:28 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-23 15:04:28 +0000
commit859f77cb4bd45be7dbcecdf8f2d842a766b0728b (patch)
treee8c18a3fb15c24d4e21f410cc036436c05466582
parent9b9b0666f8593bba45a7fdce1cdc76d6f5090c41 (diff)
downloadpuppet-859f77cb4bd45be7dbcecdf8f2d842a766b0728b.tar
puppet-859f77cb4bd45be7dbcecdf8f2d842a766b0728b.tar.gz
puppet-859f77cb4bd45be7dbcecdf8f2d842a766b0728b.tar.bz2
puppet-859f77cb4bd45be7dbcecdf8f2d842a766b0728b.tar.xz
puppet-859f77cb4bd45be7dbcecdf8f2d842a766b0728b.zip
Add buildsystem::var::webstatus
Make vhost and svn url configurable by adding buildsystem::var::webstatus.
-rw-r--r--modules/buildsystem/manifests/var/webstatus.pp5
-rw-r--r--modules/buildsystem/manifests/webstatus.pp5
2 files changed, 8 insertions, 2 deletions
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,
}
}