Split the pungi_general.conf

Let's do this to keep the pungi_multilib.conf in sync with pungi-fedora
multilib.conf.

The PR for multilib.conf could be found
[here](https://pagure.io/pungi-fedora/pull-request/1149).

Signed-off-by: Michal Konečný <mkonecny@redhat.com>

roles/bodhi2/backend/files/pungi_general.conf

@@ -15,85 +15,3 @@ greedy_method = 'build'
 # CREATEREPO
 createrepo_c = True
 createrepo_checksum = 'sha256'
-
-# MULTILIB
-# Note: If you change something here (affects updates for stable releases), also
-# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
-# we want to keep them in sync:
-# https://pagure.io/pungi-fedora/blob/main/f/general.conf
-#
-# format: {arch|*: [packages]}
-multilib_blacklist = {
-    '*': [
-        'dmraid-devel',
-        'ghc-*',
-        'httpd-core',
-        'httpd-devel',
-        'java-1.5.0-gcj-devel',
-        'java-1.6.0-openjdk-devel',
-        'java-1.7.0-icedtea-devel',
-        'java-1.7.0-openjdk-devel',
-        'java-1.8.0-openjdk-devel',
-        'kdeutils-devel',
-        'kernel*',
-        'kernel*debug*',
-        'kernel-PAE*',
-        'krb5-server',
-        'krb5-server-ldap',
-        'mkinitrd-devel',
-        'mod_*',
-        'mp',
-        'php*',
-        'php-devel',
-        'tomcat-native',
-        ],
-}
-
-# Note: If you change something here (affects updates for stable releases), also
-# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
-# we want to keep them in sync:
-# https://pagure.io/pungi-fedora/blob/main/f/general.conf
-#
-# format: {arch|*: [packages]}
-multilib_whitelist = {
-    '*': [
-        '*-static',
-        'apitrace-libs',
-        'compiler-rt',
-        'dssi-vst-wine',
-        'fakechroot-libs',
-        'fakeroot-libs',
-        'glib-networking',
-        'glx-utils',
-        'ibus-gtk2',
-        'ibus-gtk3',
-        'ibus-libs',
-        'iptables',
-        'libflashsupport',
-        'libgnat',
-        'lmms-vst',
-        'mangohud',
-        'mariadb-connector-odbc',
-        'mesa-vdpau-drivers',
-        'mesa-vulkan-drivers',
-        'mysql-connector-odbc',
-        'nosync',
-        'nspluginwrapper',
-        'nvidia-query-resource-opengl-lib',
-        'p11-kit-trust',
-        'pam',
-        'perl-libs',
-        'pipewire',
-        'postgresql-odbc',
-        'redhat-lsb',
-        'syslinux-extlinux-nonlinux',
-        'syslinux-nonlinux',
-        'syslinux-tftpboot',
-        'systemd-pam',
-        'valgrind',
-        'vkBasalt',
-        'wine',
-        'wine-*',
-        'yaboot',
-        ],
-}

roles/bodhi2/backend/files/pungi_multilib.conf

@@ -0,0 +1,81 @@
+# MULTILIB
+# Note: If you change something here (affects updates for stable releases), also
+# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
+# we want to keep them in sync:
+# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
+#
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': [
+        'dmraid-devel',
+        'ghc-*',
+        'httpd-core',
+        'httpd-devel',
+        'java-1.5.0-gcj-devel',
+        'java-1.6.0-openjdk-devel',
+        'java-1.7.0-icedtea-devel',
+        'java-1.7.0-openjdk-devel',
+        'java-1.8.0-openjdk-devel',
+        'kdeutils-devel',
+        'kernel*',
+        'kernel*debug*',
+        'kernel-PAE*',
+        'krb5-server',
+        'krb5-server-ldap',
+        'mkinitrd-devel',
+        'mod_*',
+        'mp',
+        'php*',
+        'php-devel',
+        'tomcat-native',
+        ],
+}
+
+# Note: If you change something here (affects updates for stable releases), also
+# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
+# we want to keep them in sync:
+# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
+#
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': [
+        '*-static',
+        'apitrace-libs',
+        'compiler-rt',
+        'dssi-vst-wine',
+        'fakechroot-libs',
+        'fakeroot-libs',
+        'glib-networking',
+        'glx-utils',
+        'ibus-gtk2',
+        'ibus-gtk3',
+        'ibus-libs',
+        'iptables',
+        'libflashsupport',
+        'libgnat',
+        'lmms-vst',
+        'mangohud',
+        'mariadb-connector-odbc',
+        'mesa-vdpau-drivers',
+        'mesa-vulkan-drivers',
+        'mysql-connector-odbc',
+        'nosync',
+        'nspluginwrapper',
+        'nvidia-query-resource-opengl-lib',
+        'p11-kit-trust',
+        'pam',
+        'perl-libs',
+        'pipewire',
+        'postgresql-odbc',
+        'redhat-lsb',
+        'syslinux-extlinux-nonlinux',
+        'syslinux-nonlinux',
+        'syslinux-tftpboot',
+        'systemd-pam',
+        'valgrind',
+        'vkBasalt',
+        'wine',
+        'wine-*',
+        'yaboot',
+        ],
+}

roles/bodhi2/backend/tasks/main.yml

@@ -70,7 +70,18 @@
   - config
 
 - name: Put pungi general configuration in place
-  copy: src=pungi_general.conf dest=/etc/bodhi/pungi_general.conf
+  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: multilib_general.conf
+    dest: /etc/bodhi/multilib_general.conf
   tags:
   - bodhi
   - bodhi/pungi

roles/bodhi2/backend/templates/pungi.module.conf.j2

@@ -1,5 +1,7 @@
 # Import shared settings from pungi_general.conf
 from pungi_general import *
+# Import multilib settings from pungi_multilib.conf
+from pungi_multilib import *
 
 # PRODUCT INFO
 release_version = '[[ release.version ]]'

roles/bodhi2/backend/templates/pungi.rpm.conf.j2

@@ -1,5 +1,7 @@
 # Import shared settings from pungi_general.conf
 from pungi_general import *
+# Import multilib settings from pungi_multilib.conf
+from pungi_multilib import *
 
 # PRODUCT INFO
 skip_phases = ["buildinstall", "extra_files"]