opendev
/
puppet-openstack_health
Code Issues Proposed changes

Merge "Fix scope of vhost template variables"

This commit is contained in:
Zuul 2018-06-20 08:41:27 +00:00 committed by Gerrit Code Review
parent 0687bb339e a791527485
commit cbd5245570
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/openstack-health-frontend.vhost.erb
View File

@ -9,7 +9,7 @@ Listen <%= @vhost_port %>
CustomLog ${APACHE_LOG_DIR}/openstack-health-frontend-access.log combined CustomLog ${APACHE_LOG_DIR}/openstack-health-frontend-access.log combined
ErrorLog ${APACHE_LOG_DIR}/openstack-health-frontend-error.log ErrorLog ${APACHE_LOG_DIR}/openstack-health-frontend-error.log
<Directory <%= @frontend_dir %>> <Directory <%= scope.lookupvar('::openstack_health::vhost::frontend_dir') %>>
Order allow,deny Order allow,deny
Allow from all Allow from all
<IfVersion >= 2.4> <IfVersion >= 2.4>
@ -17,6 +17,6 @@ Listen <%= @vhost_port %>
</IfVersion> </IfVersion>
</Directory> </Directory>
DocumentRoot <%= @frontend_dir %> DocumentRoot <%= scope.lookupvar('::openstack_health::vhost::frontend_dir') %>
DirectoryIndex index.html DirectoryIndex index.html
</VirtualHost> </VirtualHost>