opendev/puppet-ethercalc
Code Issues Proposed changes

Fix a couple openid parameters

Browse Source 
This needs to be a proper url, also our attempt at looking up the var
was not working, just use the same lookup of vhost_name that is used
elsewhere and known to work.

Change-Id: If906f69688bf4412f50fcfafc05861b957ce42a8
This commit is contained in:
Clark Boylan 2017-01-06 10:30:49 -08:00
parent 9816851524
commit f8d123d2ba
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/etherpadlite.vhost.erb
View File

@ -44,8 +44,8 @@
AuthName "<%= @auth_openid['banner'] %>" AuthName "<%= @auth_openid['banner'] %>"
AuthOpenIDSecureCookie On AuthOpenIDSecureCookie On
AuthOpenIDCookieLifespan 3600 AuthOpenIDCookieLifespan 3600
AuthOpenIDTrustRoot <%= @vhost_name %> AuthOpenIDTrustRoot https://<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>
AuthOpenIDServerName <%= @vhost_name %> AuthOpenIDServerName https://<%= scope.lookupvar("etherpad_lite::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'] %>