From f8d123d2bab3a99a24e49086f919ac164641145b Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 6 Jan 2017 10:30:49 -0800 Subject: [PATCH] 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 --- templates/etherpadlite.vhost.erb | 4 ++-- 1 file 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 @@ AuthName "<%= @auth_openid['banner'] %>" AuthOpenIDSecureCookie On AuthOpenIDCookieLifespan 3600 - AuthOpenIDTrustRoot <%= @vhost_name %> - AuthOpenIDServerName <%= @vhost_name %> + AuthOpenIDTrustRoot https://<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %> + AuthOpenIDServerName https://<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %> AuthOpenIDSingleIdP <%= @auth_openid['singleIdp'] %> AuthOpenIDTrusted <%= @auth_openid['trusted'] %> <% if @auth_openid['any_valid_user'] %>