From 8f44bd34b799b0b3c82e46369957326fc3a04a14 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 1 Dec 2015 14:53:46 -0800
Subject: [PATCH] openqa: set base_url in openqa.ini

this is needed for openID auth to work properly - otherwise
ipsilon thinks the request is coming from 'https://localhost'
and redirect after auth fails. openQA uses this config setting
for the openID base URL if it's set.
---
 roles/openqa/server/tasks/main.yml                              | 2 +-
 .../openqa/server/{files/openqa.ini => templates/openqa.ini.j2} | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename roles/openqa/server/{files/openqa.ini => templates/openqa.ini.j2} (75%)

diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 6fcfdddd1f..674e43ece9 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -111,7 +111,7 @@
   - config
 
 - name: OpenQA config
-  copy: src=openqa.ini dest=/etc/openqa/openqa.ini owner=geekotest group=root mode=0640
+  template: src=openqa.ini.j2 dest=/etc/openqa/openqa.ini owner=geekotest group=root mode=0640
   tags:
   - config
 
diff --git a/roles/openqa/server/files/openqa.ini b/roles/openqa/server/templates/openqa.ini.j2
similarity index 75%
rename from roles/openqa/server/files/openqa.ini
rename to roles/openqa/server/templates/openqa.ini.j2
index 58b14fe906..9ef7c5abb4 100644
--- a/roles/openqa/server/files/openqa.ini
+++ b/roles/openqa/server/templates/openqa.ini.j2
@@ -1,5 +1,6 @@
 [global]
 branding = plain
+base_url = https://{{ external_hostname }}
 
 [auth]
 method=OpenID