opendev
/
puppet-ethercalc
Code Issues Proposed changes

Merge "Fix scope of vhost template variables"

This commit is contained in:
Zuul 2018-06-19 22:45:03 +00:00 committed by Gerrit Code Review
parent 7a3b3c6f81 281acd62ab
commit 4832918302
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
templates/ethercalc.vhost.erb
View File

@ -38,20 +38,21 @@
# MSIE 7 and newer should be able to use keepalive # MSIE 7 and newer should be able to use keepalive
BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
<% if @auth_openid != nil %> <% auth_openid = scope["ethercalc::apache::auth_openid"] %>
<% if ! [nil, :undef].include?(auth_openid) %>
<Location /> <Location />
AuthType OpenID AuthType OpenID
AuthName "<%= @auth_openid['banner'] %>" AuthName "<%= auth_openid['banner'] %>"
AuthOpenIDSecureCookie On AuthOpenIDSecureCookie On
AuthOpenIDCookieLifespan 3600 AuthOpenIDCookieLifespan 3600
AuthOpenIDTrustRoot https://<%= scope.lookupvar("ethercalc::apache::vhost_name") %> AuthOpenIDTrustRoot https://<%= scope.lookupvar("ethercalc::apache::vhost_name") %>
AuthOpenIDServerName https://<%= scope.lookupvar("ethercalc::apache::vhost_name") %> AuthOpenIDServerName https://<%= scope.lookupvar("ethercalc::apache::vhost_name") %>
AuthOpenIDSingleIdP <%= @auth_openid['singleIdp'] %> AuthOpenIDSingleIdP <%= auth_openid['singleIdp'] %>
AuthOpenIDTrusted <%= @auth_openid['trusted'] %> AuthOpenIDTrusted <%= auth_openid['trusted'] %>
<% if @auth_openid['any_valid_user'] %> <% if auth_openid['any_valid_user'] %>
Require valid-user Require valid-user
<% elsif !@auth_openid['users'].empty? %> <% elsif !auth_openid['users'].empty? %>
<% @auth_openid['users'].each do |user| -%> <% auth_openid['users'].each do |user| -%>
Require user <%= user %> Require user <%= user %>
<% end -%> <% end -%>
<% end %> <% end %>