opendev/system-config
Code Issues Proposed changes

Merge "Allow project website volume path to be overridden"

Browse Source
This commit is contained in:
Zuul 2018-09-25 17:28:26 +00:00 committed by Gerrit Code Review
commit 055c35481b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openstack_project/manifests/website.pp
View File

@ -14,6 +14,7 @@
define openstack_project::website ( define openstack_project::website (
$aliases = undef, $aliases = undef,
$volume_name = undef,
$ssl_cert = undef, $ssl_cert = undef,
$ssl_key = undef, $ssl_key = undef,
$ssl_intermediate = undef, $ssl_intermediate = undef,
@ -21,11 +22,17 @@ define openstack_project::website (
) { ) {
$afs_root = '/afs/openstack.org/' $afs_root = '/afs/openstack.org/'
if $volume_name == undef {
# Default to volume name matching vhost name
$volume_name_ = $name
} else {
$volume_name_ = $volume_name
}
::httpd::vhost { $name: ::httpd::vhost { $name:
serveraliases => $aliases, serveraliases => $aliases,
port => 443, # Is required despite not being used. port => 443, # Is required despite not being used.
docroot => "${afs_root}/project/${name}/www", docroot => "${afs_root}/project/${volume_name_}/www",
priority => '50', priority => '50',
template => $template, template => $template,
require => [File["/etc/ssl/certs/${name}.pem"], require => [File["/etc/ssl/certs/${name}.pem"],