From 760d1dfd5155069aa84927e3fbb9d1387aabb57b Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sun, 3 Jun 2018 13:34:32 +0000
Subject: [PATCH] Substitute site name for survey OpenID callback

Initial testing failed to turn up some hard-coding of the server
name in the Apache mod_auth_openid configuration options. Replace
these with ERB variable expansions for the site name as used
elsewhere in that file.

Change-Id: I80793e34962ac9b6659e4ed05a6a7d5029c79429
---
 modules/openstack_project/templates/survey.vhost.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/openstack_project/templates/survey.vhost.erb b/modules/openstack_project/templates/survey.vhost.erb
index 3a6edabe87..036106e0a8 100644
--- a/modules/openstack_project/templates/survey.vhost.erb
+++ b/modules/openstack_project/templates/survey.vhost.erb
@@ -30,8 +30,8 @@
       AuthName "Welcome"
       AuthOpenIDSecureCookie On
       AuthOpenIDCookieLifespan 3600
-      AuthOpenIDTrustRoot https://survey01.openstack.org
-      AuthOpenIDServerName https://survey01.openstack.org
+      AuthOpenIDTrustRoot https://<%= @srvname %>
+      AuthOpenIDServerName https://<%= @srvname %>
       AuthOpenIDSingleIdP https://openstackid.org
       AuthOpenIDTrusted ^https://openstackid.org/.*$
       Require valid-user