opendev/puppet-storyboard
Code Issues Proposed changes

Merge "Fix scope of vhost template variables"

Browse Source
This commit is contained in:
Zuul 2018-06-12 22:46:00 +00:00 committed by Gerrit Code Review
commit 33fcbde4b2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/storyboard_http.vhost.erb
View File

@ -15,7 +15,7 @@
CustomLog ${APACHE_LOG_DIR}/storyboard-access.log combined CustomLog ${APACHE_LOG_DIR}/storyboard-access.log combined
<Directory "<%= scope.lookupvar("storyboard::application::install_root") %>"> <Directory "<%= scope.lookupvar("storyboard::application::install_root") %>">
<% if @new_vhost_perms %> <% if scope.lookupvar("storyboard::application::new_vhost_perms") %>
Require all granted Require all granted
<% else %> <% else %>
Order allow,deny Order allow,deny

2
templates/storyboard_https.vhost.erb
View File

@ -55,7 +55,7 @@
WSGIPassAuthorization On WSGIPassAuthorization On
<Directory "<%= scope.lookupvar("storyboard::application::install_root") %>"> <Directory "<%= scope.lookupvar("storyboard::application::install_root") %>">
<% if @new_vhost_perms %> <% if scope.lookupvar("storyboard::application::new_vhost_perms") %>
Require all granted Require all granted
<% else %> <% else %>
Order allow,deny Order allow,deny