diff options
author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:04:31 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:04:31 +0000 |
commit | e5bf023419cab6727bb9f73a150d49f12c48c2ee (patch) | |
tree | 75ce28938d04393cbc8426396562916c62397a8e /modules/buildsystem/manifests/webstatus.pp | |
parent | 859f77cb4bd45be7dbcecdf8f2d842a766b0728b (diff) | |
download | puppet-e5bf023419cab6727bb9f73a150d49f12c48c2ee.tar puppet-e5bf023419cab6727bb9f73a150d49f12c48c2ee.tar.gz puppet-e5bf023419cab6727bb9f73a150d49f12c48c2ee.tar.bz2 puppet-e5bf023419cab6727bb9f73a150d49f12c48c2ee.tar.xz puppet-e5bf023419cab6727bb9f73a150d49f12c48c2ee.zip |
buildsystem: add options to select webstatus location
Diffstat (limited to 'modules/buildsystem/manifests/webstatus.pp')
-rw-r--r-- | modules/buildsystem/manifests/webstatus.pp | 7 |
1 files changed, 3 insertions, 4 deletions
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, } } |