From e829acef673dfc37778cb4802e12b1927aa1339f Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 15 Apr 2024 20:29:41 +0300
Subject: [PATCH] Enable some modules

---
 msvsphere-i686/general.conf | 16 +++++++-------
 msvsphere/general.conf      | 16 +++++++-------
 variants-i686.xml           | 44 ++++++++++++++++++-------------------
 variants.xml                | 42 +++++++++++++++++------------------
 4 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/msvsphere-i686/general.conf b/msvsphere-i686/general.conf
index 6640576..684b3a7 100644
--- a/msvsphere-i686/general.conf
+++ b/msvsphere-i686/general.conf
@@ -22,13 +22,13 @@ variants_file = {
 # alternatively, it's possible to use a local variants file
 #variants_file = 'variants.xml'
 
-## use modulemd-defaults from a git repository
-#module_defaults_dir = {
-#    'scm': 'git',
-#    'repo': 'http://git.inferitos.ru/msvsphere/module-defaults.git',
-#    'branch': 'i9',
-#    'dir': '.'
-#}
+# use modulemd-defaults from a git repository
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': 'http://git.inferitos.ru/msvsphere/module-defaults.git',
+    'branch': 'i8',
+    'dir': '.'
+}
 
 gather_backend = 'dnf'
 
@@ -66,7 +66,7 @@ pkgset_source = 'koji'
 #pkgset_koji_tag = ['inferit-9_3-init', 'inferit-9_3-extras', 'inferit-9-devel']
 pkgset_koji_tag = ['inferit-8_8-bootstrap', 'inferit-8_9-extras']
 # add modules from those tags to compose
-#pkgset_koji_module_tag = ['inferit-9_3-module-init']
+pkgset_koji_module_tag = ['inferit-8_9-module-init']
 #pkgset_allow_reuse = True
 koji_profile = 'koji'
 runroot_method = "local"
diff --git a/msvsphere/general.conf b/msvsphere/general.conf
index 69c9a30..629f1fa 100644
--- a/msvsphere/general.conf
+++ b/msvsphere/general.conf
@@ -22,13 +22,13 @@ variants_file = {
 # alternatively, it's possible to use a local variants file
 #variants_file = 'variants.xml'
 
-## use modulemd-defaults from a git repository
-#module_defaults_dir = {
-#    'scm': 'git',
-#    'repo': 'http://git.inferitos.ru/msvsphere/module-defaults.git',
-#    'branch': 'i9',
-#    'dir': '.'
-#}
+# use modulemd-defaults from a git repository
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': 'http://git.inferitos.ru/msvsphere/module-defaults.git',
+    'branch': 'i8',
+    'dir': '.'
+}
 
 gather_backend = 'dnf'
 
@@ -66,7 +66,7 @@ pkgset_source = 'koji'
 #pkgset_koji_tag = ['inferit-9_3-init', 'inferit-9_3-extras', 'inferit-9-devel']
 pkgset_koji_tag = ['inferit-8_8-bootstrap', 'inferit-8_9-extras']
 # add modules from those tags to compose
-#pkgset_koji_module_tag = ['inferit-9_3-module-init']
+pkgset_koji_module_tag = ['inferit-8_9-module-init']
 #pkgset_allow_reuse = True
 koji_profile = 'koji'
 runroot_method = "local"
diff --git a/variants-i686.xml b/variants-i686.xml
index 1b5099f..affe64f 100644
--- a/variants-i686.xml
+++ b/variants-i686.xml
@@ -122,7 +122,7 @@
       <environment display_order="99">virtualization-host-environment</environment>
       <environment display_order="4">workstation-product-environment</environment>
     </environments>
-      <!--     <modules> -->
+      <modules>
       <!--       <module>389-ds:1.4</module> -->
       <!--       <module>ant:1.10</module> -->
       <!--       <module>container-tools:1.0</module> -->
@@ -133,8 +133,8 @@
       <!--       <module>eclipse:rhel8</module> -->
       <!--       <module>freeradius:3.0</module> -->
       <!--       <module>gimp:2.8</module> -->
-      <!--       <module>go-toolset:rhel8</module> -->
-      <!--       <module>httpd:2.4</module> -->
+        <module>go-toolset:rhel8</module>
+        <module>httpd:2.4</module>
       <!--       <module>idm:DL1</module> -->
       <!--       <module>idm:client</module> -->
       <!--       <module>inkscape:0.92.3</module> -->
@@ -154,17 +154,17 @@
       <!--       <module>mercurial:6.2</module> -->
       <!--       <module>mod_auth_openidc:2.3</module> -->
       <!--       <module>mysql:8.0</module> -->
-      <!--       <module>nginx:1.14</module> -->
-      <!--       <module>nginx:1.16</module> -->
-      <!--       <module>nginx:1.18</module> -->
-      <!--       <module>nginx:1.20</module> -->
-      <!--       <module>nginx:1.22</module> -->
-      <!--       <module>nodejs:10</module> -->
-      <!--       <module>nodejs:12</module> -->
-      <!--       <module>nodejs:14</module> -->
-      <!--       <module>nodejs:16</module> -->
-      <!--       <module>nodejs:18</module> -->
-      <!--       <module>nodejs:20</module> -->
+        <module>nginx:1.14</module>
+        <module>nginx:1.16</module>
+        <module>nginx:1.18</module>
+        <module>nginx:1.20</module>
+        <module>nginx:1.22</module>
+      <!--      <module>nodejs:10</module> -->
+        <module>nodejs:12</module>
+        <module>nodejs:14</module>
+        <module>nodejs:16</module>
+        <module>nodejs:18</module>
+        <module>nodejs:20</module>
       <!--       <module>parfait:0.5</module> -->
       <!--       <module>perl-App-cpanminus:1.7044</module> -->
       <!--       <module>perl-DBD-MySQL:4.046</module> -->
@@ -179,10 +179,10 @@
       <!--       <module>perl:5.26</module> -->
       <!--       <module>perl:5.30</module> -->
       <!--       <module>perl:5.32</module> -->
-      <!--       <module>php:7.2</module> -->
-      <!--       <module>php:7.3</module> -->
-      <!--       <module>php:7.4</module> -->
-      <!--       <module>php:8.0</module> -->
+        <module>php:7.2</module>
+        <module>php:7.3</module>
+        <module>php:7.4</module>
+        <module>php:8.0</module>
       <!--       <module>pki-core:10.6</module> -->
       <!--       <module>pki-deps:10.6</module> -->
       <!--       <module>pmdk:1_fileformat_v6</module> -->
@@ -195,8 +195,8 @@
       <!--       <module>python36:3.6</module> -->
       <!--       <module>python38:3.8</module> -->
       <!--       <module>python39:3.9</module> -->
-      <!--       <module>redis:5</module> -->
-      <!--       <module>redis:6</module> -->
+        <module>redis:5</module>
+        <module>redis:6</module>
       <!--       <module>rhn-tools:1.0</module> -->
       <!--       <module>ruby:2.5</module> -->
       <!--       <module>ruby:2.6</module> -->
@@ -206,7 +206,7 @@
       <!--       <module>rust-toolset:rhel8</module> -->
       <!--       <module>satellite-5-client:1.0</module> -->
       <!--       <module>scala:2.10</module> -->
-      <!--       <module>squid:4</module> -->
+        <module>squid:4</module>
       <!--       <module>subversion:1.10</module> -->
       <!--       <module>subversion:1.14</module> -->
       <!--       <module>swig:3.0</module> -->
@@ -214,7 +214,7 @@
       <!--       <module>swig:4.1</module> -->
       <!--       <module>varnish:6</module> -->
       <!--       <module>virt:rhel</module> -->
-      <!--     </modules> -->
+    </modules>
   </variant>
   <variant id="PowerTools" name="PowerTools" type="variant">
     <arches>
diff --git a/variants.xml b/variants.xml
index 3c1f9e0..d4525ca 100644
--- a/variants.xml
+++ b/variants.xml
@@ -122,7 +122,7 @@
       <environment display_order="99">virtualization-host-environment</environment>
       <environment display_order="4">workstation-product-environment</environment>
     </environments>
-      <!--     <modules> -->
+      <modules>
       <!--       <module>389-ds:1.4</module> -->
       <!--       <module>ant:1.10</module> -->
       <!--       <module>container-tools:1.0</module> -->
@@ -133,8 +133,8 @@
       <!--       <module>eclipse:rhel8</module> -->
       <!--       <module>freeradius:3.0</module> -->
       <!--       <module>gimp:2.8</module> -->
-      <!--       <module>go-toolset:rhel8</module> -->
-      <!--       <module>httpd:2.4</module> -->
+        <module>go-toolset:rhel8</module>
+        <module>httpd:2.4</module>
       <!--       <module>idm:DL1</module> -->
       <!--       <module>idm:client</module> -->
       <!--       <module>inkscape:0.92.3</module> -->
@@ -154,17 +154,17 @@
       <!--       <module>mercurial:6.2</module> -->
       <!--       <module>mod_auth_openidc:2.3</module> -->
       <!--       <module>mysql:8.0</module> -->
-      <!--       <module>nginx:1.14</module> -->
-      <!--       <module>nginx:1.16</module> -->
-      <!--       <module>nginx:1.18</module> -->
-      <!--       <module>nginx:1.20</module> -->
-      <!--       <module>nginx:1.22</module> -->
+        <module>nginx:1.14</module>
+        <module>nginx:1.16</module>
+        <module>nginx:1.18</module>
+        <module>nginx:1.20</module>
+        <module>nginx:1.22</module>
       <!--       <module>nodejs:10</module> -->
-      <!--       <module>nodejs:12</module> -->
-      <!--       <module>nodejs:14</module> -->
-      <!--       <module>nodejs:16</module> -->
-      <!--       <module>nodejs:18</module> -->
-      <!--       <module>nodejs:20</module> -->
+        <module>nodejs:12</module>
+        <module>nodejs:14</module>
+        <module>nodejs:16</module>
+        <module>nodejs:18</module>
+        <module>nodejs:20</module>
       <!--       <module>parfait:0.5</module> -->
       <!--       <module>perl-App-cpanminus:1.7044</module> -->
       <!--       <module>perl-DBD-MySQL:4.046</module> -->
@@ -179,10 +179,10 @@
       <!--       <module>perl:5.26</module> -->
       <!--       <module>perl:5.30</module> -->
       <!--       <module>perl:5.32</module> -->
-      <!--       <module>php:7.2</module> -->
-      <!--       <module>php:7.3</module> -->
-      <!--       <module>php:7.4</module> -->
-      <!--       <module>php:8.0</module> -->
+        <module>php:7.2</module>
+        <module>php:7.3</module>
+        <module>php:7.4</module>
+        <module>php:8.0</module>
       <!--       <module>pki-core:10.6</module> -->
       <!--       <module>pki-deps:10.6</module> -->
       <!--       <module>pmdk:1_fileformat_v6</module> -->
@@ -195,8 +195,8 @@
       <!--       <module>python36:3.6</module> -->
       <!--       <module>python38:3.8</module> -->
       <!--       <module>python39:3.9</module> -->
-      <!--       <module>redis:5</module> -->
-      <!--       <module>redis:6</module> -->
+        <module>redis:5</module>
+        <module>redis:6</module>
       <!--       <module>rhn-tools:1.0</module> -->
       <!--       <module>ruby:2.5</module> -->
       <!--       <module>ruby:2.6</module> -->
@@ -206,7 +206,7 @@
       <!--       <module>rust-toolset:rhel8</module> -->
       <!--       <module>satellite-5-client:1.0</module> -->
       <!--       <module>scala:2.10</module> -->
-      <!--       <module>squid:4</module> -->
+        <module>squid:4</module>
       <!--       <module>subversion:1.10</module> -->
       <!--       <module>subversion:1.14</module> -->
       <!--       <module>swig:3.0</module> -->
@@ -214,7 +214,7 @@
       <!--       <module>swig:4.1</module> -->
       <!--       <module>varnish:6</module> -->
       <!--       <module>virt:rhel</module> -->
-      <!--     </modules> -->
+      </modules>
   </variant>
   <variant id="PowerTools" name="PowerTools" type="variant">
     <arches>