summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2017-01-06 10:30:49 -0800
committerClark Boylan <clark.boylan@gmail.com>2017-01-06 10:30:49 -0800
commitf8d123d2bab3a99a24e49086f919ac164641145b (patch)
tree4e4568547ceadbea17fd76da885316f7e6fd4683
parent981685152423b563f51ffd0e72f4b200228d6530 (diff)
Fix a couple openid parameters
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
Notes
Notes (review): Code-Review+2: Paul Belanger <pabelanger@redhat.com> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 06 Jan 2017 20:09:19 +0000 Reviewed-on: https://review.openstack.org/417473 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--templates/etherpadlite.vhost.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/etherpadlite.vhost.erb b/templates/etherpadlite.vhost.erb
index e20fe09..5cd0147 100644
--- a/templates/etherpadlite.vhost.erb
+++ b/templates/etherpadlite.vhost.erb
@@ -44,8 +44,8 @@
44 AuthName "<%= @auth_openid['banner'] %>" 44 AuthName "<%= @auth_openid['banner'] %>"
45 AuthOpenIDSecureCookie On 45 AuthOpenIDSecureCookie On
46 AuthOpenIDCookieLifespan 3600 46 AuthOpenIDCookieLifespan 3600
47 AuthOpenIDTrustRoot <%= @vhost_name %> 47 AuthOpenIDTrustRoot https://<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>
48 AuthOpenIDServerName <%= @vhost_name %> 48 AuthOpenIDServerName https://<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>
49 AuthOpenIDSingleIdP <%= @auth_openid['singleIdp'] %> 49 AuthOpenIDSingleIdP <%= @auth_openid['singleIdp'] %>
50 AuthOpenIDTrusted <%= @auth_openid['trusted'] %> 50 AuthOpenIDTrusted <%= @auth_openid['trusted'] %>
51 <% if @auth_openid['any_valid_user'] %> 51 <% if @auth_openid['any_valid_user'] %>