From 3d8ca34ec6edb446693e689ec78cc0e38e5500f4 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 2 Sep 2019 16:42:15 +0200
Subject: [PATCH] copr: slightly sync copr/frontend and copr/frontend-cloud

At least for the latest config options.
---
 roles/copr/frontend-cloud/templates/copr.conf | 11 +++++++++++
 roles/copr/frontend/templates/copr.conf       | 10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/roles/copr/frontend-cloud/templates/copr.conf b/roles/copr/frontend-cloud/templates/copr.conf
index 48d897606f..1ab33ce136 100644
--- a/roles/copr/frontend-cloud/templates/copr.conf
+++ b/roles/copr/frontend-cloud/templates/copr.conf
@@ -90,8 +90,19 @@ BLACKLISTED_GROUPS = ['fedorabugs', 'packager', 'provenpackager']
 
 DEFER_BUILD_SECONDS = 300
 
+ENABLE_DISCUSSION = True
+DISCOURSE_URL = "https://discussion.fedoraproject.org/"
+
 # We may have a (temporary) chroot that doesn't correspond with /etc/os-release
 # on a client system, e.g. "rhelbeta-8" chroots in Copr which doesn't match to
 # any real system, instead it is a temporary alias for "epel-8". In such case,
 # set this to {"epel-8": "rhelbeta-8"}
 CHROOT_NAME_RELEASE_ALIAS = {"epel-8": "rhelbeta-8"}
+{% if whitelist_emails is defined %}
+
+WHITELIST_EMAILS = [
+{% for recipient in whitelist_emails %}
+  "{{ recipient }}",
+{% endfor %}
+]
+{% endif %}
diff --git a/roles/copr/frontend/templates/copr.conf b/roles/copr/frontend/templates/copr.conf
index a30535e55f..0c9ea85a76 100644
--- a/roles/copr/frontend/templates/copr.conf
+++ b/roles/copr/frontend/templates/copr.conf
@@ -66,10 +66,16 @@ DEFER_BUILD_SECONDS = 300
 ENABLE_DISCUSSION = True
 DISCOURSE_URL = "https://discussion.fedoraproject.org/"
 
-WHITELIST_EMAILS = [
+# We may have a (temporary) chroot that doesn't correspond with /etc/os-release
+# on a client system, e.g. "rhelbeta-8" chroots in Copr which doesn't match to
+# any real system, instead it is a temporary alias for "epel-8". In such case,
+# set this to {"epel-8": "rhelbeta-8"}
+CHROOT_NAME_RELEASE_ALIAS = {"epel-8": "rhelbeta-8"}
 {% if whitelist_emails is defined %}
+
+WHITELIST_EMAILS = [
 {% for recipient in whitelist_emails %}
   "{{ recipient }}",
 {% endfor %}
-{% endif %}
 ]
+{% endif %}