From 947f6df4b284489f042b66b68b4723f95eb29e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= <mkonecny@redhat.com>
Date: Wed, 3 May 2023 14:13:08 +0200
Subject: [PATCH] [bodhi-backend] Move pungi_general.conf to templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are some values that need to be filled in the pungi_general.conf. Let's move it
to templates, so it could be processed as every other template.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
---
 roles/bodhi2/backend/tasks/main.yml                    | 10 +---------
 .../pungi_general.conf.j2}                             |  0
 2 files changed, 1 insertion(+), 9 deletions(-)
 rename roles/bodhi2/backend/{files/pungi_general.conf => templates/pungi_general.conf.j2} (100%)

diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 4ba5bba733..b8e811f615 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -60,6 +60,7 @@
 - name: Put pungi configurations in place
   template: src="{{item}}" dest=/etc/bodhi/{{item}}
   with_items:
+  - pungi.general.conf.j2
   - pungi.module.conf.j2
   - pungi.rpm.conf.j2
   - variants.module.xml.j2
@@ -69,15 +70,6 @@
   - bodhi/pungi
   - config
 
-- name: Put pungi general configuration in place
-  copy:
-    src: pungi_general.conf
-    dest: /etc/bodhi/pungi_general.conf
-  tags:
-  - bodhi
-  - bodhi/pungi
-  - config
-
 - name: Put pungi multilib configuration in place
   copy:
     src: pungi_multilib.conf
diff --git a/roles/bodhi2/backend/files/pungi_general.conf b/roles/bodhi2/backend/templates/pungi_general.conf.j2
similarity index 100%
rename from roles/bodhi2/backend/files/pungi_general.conf
rename to roles/bodhi2/backend/templates/pungi_general.conf.j2