From 9ba4982e1340fa1145b01af8ed2099b0ce5d2f60 Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Sat, 12 Aug 2023 20:16:08 +0300
Subject: [PATCH] Drop separate configuration for Server

---
 msvsphere-9-server.conf                   | 38 ----------
 msvsphere/additional_packages-server.conf | 31 --------
 msvsphere/additional_packages_all.conf    | 89 -----------------------
 3 files changed, 158 deletions(-)
 delete mode 100644 msvsphere-9-server.conf
 delete mode 100644 msvsphere/additional_packages-server.conf
 delete mode 100644 msvsphere/additional_packages_all.conf

diff --git a/msvsphere-9-server.conf b/msvsphere-9-server.conf
deleted file mode 100644
index 690dd86..0000000
--- a/msvsphere-9-server.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# MSVSphere Server 9 Pungi configuration file
-#
-# Notes:
-#   - there is a problem with accessing git.inferitos.ru repositories via
-#     HTTPs from our internal network, so we have to use HTTP for now.
-
-from msvsphere/general import *
-from msvsphere/multilib import *
-from msvsphere/additional_packages-server import *
-
-# product information
-release_name = 'MSVSphere Server'
-release_short = 'MSVSphere'
-release_version = '9.2'
-treeinfo_version = '9'
-
-extra_isos = {
-    "Server": [{
-        "include_variants": [],
-        "filename": "{release_short}-9.2-{arch}-server{suffix}",
-        "skip_src": True,
-        "arches": ['x86_64'],
-        "failable_arches": ['i386'],
-        "extra_files": [
-            {
-                'scm': 'git',
-                'repo': 'http://git.inferitos.ru/rpms/sphere-release.git',
-                'branch': 'i9',
-                'file': [
-                    'SOURCES/EULA',
-                    'SOURCES/LICENSE',
-                    'SOURCES/RPM-GPG-KEY-MSVSphere-9'
-                ]
-            }
-        ]
-    }]
-}
diff --git a/msvsphere/additional_packages-server.conf b/msvsphere/additional_packages-server.conf
deleted file mode 100644
index 3f059bc..0000000
--- a/msvsphere/additional_packages-server.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-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"
-            ]
-        }
-    )
-]
diff --git a/msvsphere/additional_packages_all.conf b/msvsphere/additional_packages_all.conf
deleted file mode 100644
index e15f965..0000000
--- a/msvsphere/additional_packages_all.conf
+++ /dev/null
@@ -1,89 +0,0 @@
-additional_packages = [
-    (   
-        '^Minimal$', {
-            '*': [
-                "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"
-            ]
-        }
-    ),
-    (   
-        '^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",
-                "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"
-            ]
-        }
-    )
-]