opendev
/
system-config
Code Issues Proposed changes

Evaluate files vhosts after we determine ssl file paths 

Previously we evaluated the vhost templates before setting
ssl_cert_file_ and ssl_key_file_ and ssl_chain_file_. This made erb
unhappy because those are the three variables we use to set paths in the
vhost. Fix this by moving the vhost after the ssl file vars are set.

Change-Id: I4ba62521c9e7da104f8799d016cbcf0214cbdfc1
This commit is contained in:
Clark Boylan 2019-06-06 16:28:37 -07:00
parent 9ea8edc341
commit fd97e061ae
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,14 +39,6 @@ define openstack_project::website (
$docroot_ = $docroot
}
::httpd::vhost { $name:
serveraliases => $aliases,
port => 443, # Is required despite not being used.
docroot => $docroot_,
priority => '50',
content => template($template)
}
if ($ssl_cert != undef) {
$ssl_cert_file_ = "/etc/ssl/certs/${name}.pem"
file { "${ssl_cert_file_}":
@ -88,4 +80,12 @@ define openstack_project::website (
} else {
$ssl_chain_file_ = $ssl_chain_file
}
::httpd::vhost { $name:
serveraliases => $aliases,
port => 443, # Is required despite not being used.
docroot => $docroot_,
priority => '50',
content => template($template)
}
}