From 714196038f42f8683467af9932a85ddc4e999bfb Mon Sep 17 00:00:00 2001
From: Sergey V Turchin <zerg@altlinux.org>
Date: Wed, 5 Jun 2024 11:22:33 +0300
Subject: [PATCH] - kwrk: move group policies to installer options

---
 conf.d/kworkstation.mk                       |  2 +-
 pkg.in/groups/kworkstation/add-adm.directory | 12 ++++++++++++
 pkg.in/lists/kworkstation/add-adm            |  2 ++
 pkg.in/lists/kworkstation/clients-ad         |  2 ++
 pkg.in/lists/kworkstation/disk-install       |  1 -
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 pkg.in/groups/kworkstation/add-adm.directory
 create mode 100644 pkg.in/lists/kworkstation/add-adm

diff --git a/conf.d/kworkstation.mk b/conf.d/kworkstation.mk
index 5990a974..4546ccd3 100644
--- a/conf.d/kworkstation.mk
+++ b/conf.d/kworkstation.mk
@@ -204,7 +204,7 @@ distro/kworkstation-install: \
 	video-editing sound-editing graphics-editing \
 	z00-add-3dparty 3dparty-flatpak 3dparty-snap \
 	z01-add-clients clients-ad clients-ipa clients-backup clients-cloud clients-monitor \
-	z02-add-additional add-oem add-tablet add-webterminal add-no4k-screen)
+	z02-add-additional add-adm add-oem add-tablet add-webterminal add-no4k-screen)
 
 distro/kworkstation-install: \
 	mixin/kworkstation-install-deps \
diff --git a/pkg.in/groups/kworkstation/add-adm.directory b/pkg.in/groups/kworkstation/add-adm.directory
new file mode 100644
index 00000000..eaf9cd82
--- /dev/null
+++ b/pkg.in/groups/kworkstation/add-adm.directory
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+X-Alterator-PackageList=kworkstation/add-adm
+X-Alterator-Required=no
+X-Alterator-Parent=kworkstation/z02-add-additional
+Categories=KDE;GNOME;XFCE
+
+Name=Administration tools
+Name[ru_RU]=Инструменты администрирования
+Comment=Misc administration tools.
+Comment[ru_RU]=Различные инструменты администрирования.
diff --git a/pkg.in/lists/kworkstation/add-adm b/pkg.in/lists/kworkstation/add-adm
new file mode 100644
index 00000000..1fe17a84
--- /dev/null
+++ b/pkg.in/lists/kworkstation/add-adm
@@ -0,0 +1,2 @@
+admc
+gpui
diff --git a/pkg.in/lists/kworkstation/clients-ad b/pkg.in/lists/kworkstation/clients-ad
index 74774f18..91f1dc04 100644
--- a/pkg.in/lists/kworkstation/clients-ad
+++ b/pkg.in/lists/kworkstation/clients-ad
@@ -3,4 +3,6 @@ task-auth-ad-sssd
 kde5-autofs-shares
 krb5-ticket-watcher
 task-auth-ldap-sssd
+gpupdate
 alterator-gpupdate
+admx-basealt admx-samba admx-chromium admx-firefox admx-yandex-browser admx-msi-setup
diff --git a/pkg.in/lists/kworkstation/disk-install b/pkg.in/lists/kworkstation/disk-install
index a5302340..33a6b536 100644
--- a/pkg.in/lists/kworkstation/disk-install
+++ b/pkg.in/lists/kworkstation/disk-install
@@ -51,7 +51,6 @@ freeipa-server freeipa-server-dns
 #
 alt-customize-branding
 task-samba-dc bind-utils tdb-utils installer-feature-sambaDC-stage3
-gpui admc admx-basealt admx-samba admx-chromium admx-firefox admx-yandex-browser admx-msi-setup
 #
 alterator-kiosk kiosk-profiles
 alterator-net-domain