From 7ebdf7712ed4178714f90af56bb2019c66c3503f Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Sun, 9 Jul 2023 23:49:59 +0300
Subject: [PATCH] Added Server iso and update Extras package list

---
 msvsphere-9.conf | 70 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 4 deletions(-)

diff --git a/msvsphere-9.conf b/msvsphere-9.conf
index 0f0b1d4..99b474a 100644
--- a/msvsphere-9.conf
+++ b/msvsphere-9.conf
@@ -48,7 +48,7 @@ gather_method = {
         "comps": "deps",
         "json": "deps",
     },
-    "^(AppStream|CRB|Minimal|Extras)$": "hybrid",
+    "^(AppStream|CRB|Minimal|Server|Extras)$": "hybrid",
 }
 
 hashed_directories = False
@@ -120,7 +120,7 @@ iso_hfs_ppc64le_compatible = False
 
 extra_isos = {
     "BaseOS": [{
-        "include_variants": ["AppStream"],
+        "include_variants": ["AppStream", "Extras"],
         #"filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
         "filename": "{release_short}-9.2-alpha-{arch}-{disc_type}{suffix}",
         "skip_src": True,
@@ -141,6 +141,13 @@ extra_isos = {
         "skip_src": True,
         "arches": ['x86_64'],
         "failable_arches": ['i386']
+    }],
+    "Server": [{
+        "include_variants": [],
+        "filename": "{release_short}-9.2-alpha-{arch}-server{suffix}",
+        "skip_src": True,
+        "arches": ['x86_64'],
+        "failable_arches": ['i386']
     }]
 }
 
@@ -149,7 +156,7 @@ create_optional_isos = False
 createiso_use_xorrisofs = True
 
 createiso_skip = [
-    ("^(BaseOS|AppStream|CRB|Minimal|Extras)$", {
+    ("^(BaseOS|AppStream|CRB|Minimal|Server|Extras)$", {
         # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
         # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
         # No binary or src ISOs for CRB
@@ -241,10 +248,65 @@ additional_packages = [
             ]
         }
     ),
+    (
+        '^Server$', {
+            '*': [
+                "aide",
+                "audispd-plugins",
+                "dnf-automatic",
+                "fapolicyd",
+                "gnutls-utils",
+                "kernel-modules-extra",
+                "libreswan",
+                "libsss_sudo",
+                "policycoreutils-python-utils",
+                "rear",
+                "rng-tools",
+                "rsyslog-gnutls",
+                "subscription-manager",
+                "usbguard",
+                "kernel",
+                "glibc-gconv-extra.i686",
+                "libsss_autofs",
+                "sssd-nfs-idmap",
+                "kbd-legacy",
+                "container-selinux",
+                "flatpak-selinux",
+                "libdecor",
+                "ibus-gtk2"
+            ]
+        }
+    ),
     (
         '^Extras$', {
             '*': [
-                "anaconda-live"
+                "anaconda-live",
+                "bats",
+                "chromium",
+                "epel-release",
+                "fontconfig-font-replacements",
+                "fontconfig-enhanced-defaults",
+                "gnome-shell-extension-appindicator",
+                "gnome-shell-extension-arcmenu",
+                "gnome-shell-extension-dash-to-panel",
+                "gnome-shell-extension-no-overview",
+                "google-roboto-fonts",
+                "hardinfo",
+                "htop",
+                "kora-icon-theme",
+                "mock",
+                "pipewire-module-xrdp",
+                "redhat-lsb",
+                "remmina",
+                "remmina-devel",
+                "remmina-gnome-session",
+                "remmina-plugins-exec",
+                "remmina-plugins-python",
+                "remmina-plugins-rdp",
+                "remmina-plugins-secret",
+                "remmina-plugins-vnc",
+                "remmina-plugins-www",
+                "salt"
             ]
         }
     )