summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-12 22:46:00 +0000
committerGerrit Code Review <review@openstack.org>2018-06-12 22:46:00 +0000
commit33fcbde4b28e3890bc75cf2642fc0801ef27374d (patch)
tree810217fb91f691d79c74f66c6473c09d89c86c45
parentf36b4dce39b1b209ff94a3666156e6e937bf54f1 (diff)
parent6153eec79547e08d83364f4d35a5a99970a250ef (diff)
Merge "Fix scope of vhost template variables"
-rw-r--r--templates/storyboard_http.vhost.erb2
-rw-r--r--templates/storyboard_https.vhost.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/storyboard_http.vhost.erb b/templates/storyboard_http.vhost.erb
index 17e0893..7020bc8 100644
--- a/templates/storyboard_http.vhost.erb
+++ b/templates/storyboard_http.vhost.erb
@@ -15,7 +15,7 @@
15 CustomLog ${APACHE_LOG_DIR}/storyboard-access.log combined 15 CustomLog ${APACHE_LOG_DIR}/storyboard-access.log combined
16 16
17 <Directory "<%= scope.lookupvar("storyboard::application::install_root") %>"> 17 <Directory "<%= scope.lookupvar("storyboard::application::install_root") %>">
18 <% if @new_vhost_perms %> 18 <% if scope.lookupvar("storyboard::application::new_vhost_perms") %>
19 Require all granted 19 Require all granted
20 <% else %> 20 <% else %>
21 Order allow,deny 21 Order allow,deny
diff --git a/templates/storyboard_https.vhost.erb b/templates/storyboard_https.vhost.erb
index 221499c..9e24526 100644
--- a/templates/storyboard_https.vhost.erb
+++ b/templates/storyboard_https.vhost.erb
@@ -55,7 +55,7 @@
55 WSGIPassAuthorization On 55 WSGIPassAuthorization On
56 56
57 <Directory "<%= scope.lookupvar("storyboard::application::install_root") %>"> 57 <Directory "<%= scope.lookupvar("storyboard::application::install_root") %>">
58 <% if @new_vhost_perms %> 58 <% if scope.lookupvar("storyboard::application::new_vhost_perms") %>
59 Require all granted 59 Require all granted
60 <% else %> 60 <% else %>
61 Order allow,deny 61 Order allow,deny