From d1dfbf63b79b466ad581e2fa50332a9ee9b45d48 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 20 May 2016 13:57:19 +0000
Subject: [PATCH] Prepare Koschei prod config for update to 1.7

---
 roles/koschei/backend/tasks/main.yml           | 2 --
 roles/koschei/frontend/templates/httpd.conf.j2 | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/roles/koschei/backend/tasks/main.yml b/roles/koschei/backend/tasks/main.yml
index a7fc61d797..b32d06c85e 100644
--- a/roles/koschei/backend/tasks/main.yml
+++ b/roles/koschei/backend/tasks/main.yml
@@ -128,13 +128,11 @@
     src=koschei-refresh-group
     dest=/usr/local/bin/koschei-refresh-group
     mode=755
-  when: env == 'staging'
   tags:
   - koschei
 
 - name: Copy the group refresh cronjob
   template: src=cron-refresh-groups.j2 dest=/etc/cron.d/cron-refresh-groups
-  when: env == 'staging'
   tags:
   - koschei
   - config
diff --git a/roles/koschei/frontend/templates/httpd.conf.j2 b/roles/koschei/frontend/templates/httpd.conf.j2
index bee397f084..8debae58d5 100644
--- a/roles/koschei/frontend/templates/httpd.conf.j2
+++ b/roles/koschei/frontend/templates/httpd.conf.j2
@@ -16,14 +16,17 @@
         Require all granted
     </Directory>
 
-{% if env == 'staging' %}
     <Location /koschei/login>
         Require valid-user
         AuthType OpenID
         AuthOpenIDSingleIdP https://{{ koschei_openid_provider }}/
+{% if env == 'staging' %}
         AuthOpenIDServerName https://apps.stg.fedoraproject.org
         AuthOpenIDTrustRoot https://apps.stg.fedoraproject.org/koschei/
+{% else %}
+        AuthOpenIDServerName https://apps.fedoraproject.org
+        AuthOpenIDTrustRoot https://apps.fedoraproject.org/koschei/
+{% endif %}
         AuthOpenIDUseCookie off
     </Location>
-{% endif %}
 </VirtualHost>