aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-07-25 21:28:54 +0000
committerNicolas Vigier <boklm@mageia.org>2013-07-25 21:28:54 +0000
commit850c98f03184045f06725507518a0ac6edf4ba6f (patch)
tree16d3c5f0a6008978cfdda682d83c215a23c80d24
parentf73df6dfe4a8d2f71e9c2fe804cb72e77670248c (diff)
downloadpuppet-850c98f03184045f06725507518a0ac6edf4ba6f.tar
puppet-850c98f03184045f06725507518a0ac6edf4ba6f.tar.gz
puppet-850c98f03184045f06725507518a0ac6edf4ba6f.tar.bz2
puppet-850c98f03184045f06725507518a0ac6edf4ba6f.tar.xz
puppet-850c98f03184045f06725507518a0ac6edf4ba6f.zip
add ssl vhost for pkgsubmit.mageia.org
-rw-r--r--modules/buildsystem/manifests/webstatus.pp15
1 files changed, 14 insertions, 1 deletions
diff --git a/modules/buildsystem/manifests/webstatus.pp b/modules/buildsystem/manifests/webstatus.pp
index ad458a45..b195a320 100644
--- a/modules/buildsystem/manifests/webstatus.pp
+++ b/modules/buildsystem/manifests/webstatus.pp
@@ -7,7 +7,20 @@ class buildsystem::webstatus {
ensure => directory,
}
- apache::vhost::base { $buildsystem::var::webstatus::hostname:
+ $vhost = $buildsystem::var::webstatus::hostname
+ apache::vhost::base { $vhost:
+ aliases => {
+ '/uploads' => "${buildsystem::var::scheduler::homedir}/uploads",
+ '/autobuild/cauldron/x86_64/core/log/status.core.log' => "$location/autobuild/broken.php",
+ '/themes' => $buildsystem::var::webstatus::themes_dir,
+ },
+ location => $buildsystem::var::webstatus::location,
+ content => template('buildsystem/vhost_webstatus.conf'),
+ }
+
+ apache::vhost::base { "ssl_${vhost}":
+ vhost => $vhost,
+ use_ssl => true,
aliases => {
'/uploads' => "${buildsystem::var::scheduler::homedir}/uploads",
'/autobuild/cauldron/x86_64/core/log/status.core.log' => "$location/autobuild/broken.php",