groups/server-v, server-v.mk: renumbering of groups for Server-V

2019-07-10 18:45:33 +03:00 · 2019-07-10 18:45:33 +03:00 · 03d5b6979a
commit 03d5b6979a
parent f3d5664d12
88 changed files with 94 additions and 94 deletions
--- a/conf.d/server-v.mk
+++ b/conf.d/server-v.mk
@ -40,13 +40,13 @@ distro/server-v: monitoring = $(addprefix server-v/,\
 # zabbix prometheus influxdb grafana

 distro/server-v: backup = $(addprefix server-v/,\
-	burp)
+	burp bacula)

 distro/server-v: logging = $(addprefix server-v/,\
 	rsyslog-classic systemd-journal-remote)

 distro/server-v: profiles = $(addprefix server-v/,\
-	10-basic 20-pve 41-opennebula-node 42-opennebula-server 51-openstack-node 52-openstack-controller 61-docker)
+	110-basic 120-pve 131-opennebula-node 132-opennebula-server 141-openstack-node 142-openstack-controller 201-docker)

 distro/.server-v-base: distro/.installer use/syslinux/ui/menu use/memtest
 	@$(call add,BASE_LISTS,server-base openssh)
@ -73,24 +73,24 @@ distro/server-v: distro/.server-v-base \
 	@$(call add,SYSTEM_PACKAGES,mdadm-tool lvm2 multipath-tools vdo)
 	@$(call add,BASE_KMODULES,ipset kvm xtables-addons kvdo)
 	@$(call add,BASE_LISTS,virt/base.pkgs)
-	@$(call add,MAIN_GROUPS,server-v/10-basic server-v/kvm)
-	@$(call add,MAIN_GROUPS,server-v/11-cockpit $(cockpit))
-	@$(call add,MAIN_GROUPS,server-v/20-pve server-v/pve)
-	@$(call add,MAIN_GROUPS,server-v/30-opennebula $(opennebula))
-	@$(call add,MAIN_GROUPS,server-v/40-openstack $(openstack))
-	@$(call add,MAIN_GROUPS,server-v/60-container $(container))
-	@$(call add,MAIN_GROUPS,server-v/65-cluster server-v/corosync_pacemaker)
-	@$(call add,MAIN_GROUPS,server-v/70-storage)
-	@$(call add,MAIN_GROUPS,server-v/71-ceph $(ceph))
-	@$(call add,MAIN_GROUPS,server-v/72-glusterfs $(glusterfs))
-	@$(call add,MAIN_GROUPS,server-v/74-lizardfs $(lizardfs))
-	@$(call add,MAIN_GROUPS,server-v/75-nfs $(nfs))
-	@$(call add,MAIN_GROUPS,server-v/76-iscsi $(iscsi))
+	@$(call add,MAIN_GROUPS,server-v/110-basic server-v/kvm)
+	@$(call add,MAIN_GROUPS,server-v/111-cockpit $(cockpit))
+	@$(call add,MAIN_GROUPS,server-v/120-pve server-v/pve)
+	@$(call add,MAIN_GROUPS,server-v/130-opennebula $(opennebula))
+	@$(call add,MAIN_GROUPS,server-v/140-openstack $(openstack))
+	@$(call add,MAIN_GROUPS,server-v/200-container $(container))
+	@$(call add,MAIN_GROUPS,server-v/300-cluster server-v/corosync_pacemaker)
+	@$(call add,MAIN_GROUPS,server-v/400-storage)
+	@$(call add,MAIN_GROUPS,server-v/410-ceph $(ceph))
+	@$(call add,MAIN_GROUPS,server-v/420-glusterfs $(glusterfs))
+	@$(call add,MAIN_GROUPS,server-v/430-lizardfs $(lizardfs))
+	@$(call add,MAIN_GROUPS,server-v/450-nfs $(nfs))
+	@$(call add,MAIN_GROUPS,server-v/460-iscsi $(iscsi))
 	@$(call add,MAIN_GROUPS,server-v/ocfs2)
-	@$(call add,MAIN_GROUPS,server-v/80-network $(network))
-	@$(call add,MAIN_GROUPS,server-v/90-monitoring $(monitoring))
-	@$(call add,MAIN_GROUPS,server-v/100-backup $(backup))
-	@$(call add,MAIN_GROUPS,server-v/110-logging $(logging))
+	@$(call add,MAIN_GROUPS,server-v/500-network $(network))
+	@$(call add,MAIN_GROUPS,server-v/600-monitoring $(monitoring))
+	@$(call add,MAIN_GROUPS,server-v/700-backup $(backup))
+	@$(call add,MAIN_GROUPS,server-v/800-logging $(logging))
 	@$(call add,THE_PROFILES,$(profiles) minimal)
 	@$(call add,SERVICES_ENABLE,sshd)
 	@$(call add,SERVICES_ENABLE,libvirtd)
--- a/pkg.in/groups/server-v/110-basic.directory
+++ b/pkg.in/groups/server-v/110-basic.directory
--- a/pkg.in/groups/server-v/111-cockpit.directory
+++ b/pkg.in/groups/server-v/111-cockpit.directory
@ -6,4 +6,4 @@ Name[ru_RU]=Cockpit - Интерфейс управления сервером
 Comment=Cockpit is an interactive server admin interface
 Comment[ru_RU]=Cockpit - интерактивный интерфейс управления сервером
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/10-basic
+X-Alterator-Parent=server-v/110-basic
--- a/pkg.in/groups/server-v/120-pve.directory
+++ b/pkg.in/groups/server-v/120-pve.directory
@ -4,6 +4,6 @@ Type=Directory
 Name=Proxmox Virtual Environment
 Name[ru_RU]=Виртуальное Окружение Proxmox
 X-Alterator-Required=no
-X-Alterator-Conflicts=server-v/10-basic server-virt/30-opennebula server-virt/40-openstack
+X-Alterator-Conflicts=server-v/110-basic server-virt/130-opennebula server-virt/140-openstack
 Comment=Proxmox Virtual Environment
 Comment[ru_RU]=Виртуальное Окружение Proxmox
--- a/pkg.in/groups/server-v/130-opennebula.directory
+++ b/pkg.in/groups/server-v/130-opennebula.directory
@ -4,6 +4,6 @@ Type=Directory
 Name=OpenNebula Virtualization Solution
 Name[ru_RU]=Виртуализация OpenNebula
 X-Alterator-Required=no
-X-Alterator-Conflicts=server-v/20-pve server-virt/40-openstack
+X-Alterator-Conflicts=server-v/120-pve server-virt/140-openstack
 Comment=OpenNebula solution to build Private Clouds and manage Data Center virtualization
 Comment[ru_RU]=Opennebula это решение для построения частного облака и управления виртуальным центром обработки данных
--- a/pkg.in/groups/server-v/140-openstack.directory
+++ b/pkg.in/groups/server-v/140-openstack.directory
@ -4,6 +4,6 @@ Type=Directory
 Name=OpenStack Virtualization Solution
 Name[ru_RU]=Виртуализация OpenStack
 X-Alterator-Required=no
-X-Alterator-Conflicts=server-v/20-pve server-virt/30-opennebula
+X-Alterator-Conflicts=server-v/120-pve server-virt/130-opennebula
 Comment=OpenStack is a cloud operating system
 Comment[ru_RU]=Комплекс проектов для создания инфраструктурных облачных сервисов
--- a/pkg.in/groups/server-v/200-container.directory
+++ b/pkg.in/groups/server-v/200-container.directory
--- a/pkg.in/groups/server-v/300-cluster.directory
+++ b/pkg.in/groups/server-v/300-cluster.directory
--- a/pkg.in/groups/server-v/400-storage.directory
+++ b/pkg.in/groups/server-v/400-storage.directory
--- a/pkg.in/groups/server-v/410-ceph.directory
+++ b/pkg.in/groups/server-v/410-ceph.directory
@ -6,4 +6,4 @@ Name[ru_RU]=Ceph
 X-Alterator-Required=no
 Comment=Ceph uniquely delivers object, block, and file storage in one unified system
 Comment[ru_RU]=Ceph уникальным образом обеспечивает хранение объектов, блоков и файлов в единой системе
-X-Alterator-Parent=server-v/70-storage
+X-Alterator-Parent=server-v/400-storage
--- a/pkg.in/groups/server-v/420-glusterfs.directory
+++ b/pkg.in/groups/server-v/420-glusterfs.directory
@ -6,4 +6,4 @@ Name[ru_RU]=GlusterFS
 X-Alterator-Required=no
 Comment=GlusterFS is a scalable network filesystem
 Comment[ru_RU]=GlusterFS - это масштабируемая сетевая файловая система
-X-Alterator-Parent=server-v/70-storage
+X-Alterator-Parent=server-v/400-storage
--- a/pkg.in/groups/server-v/430-lizardfs.directory
+++ b/pkg.in/groups/server-v/430-lizardfs.directory
@ -1,9 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Directory
-Name=MooseFS
+Name=LizardFS
 Name[ru_RU]=LizardFS
 X-Alterator-Required=no
 Comment=Network Distributed File System
 Comment[ru_RU]=Oтказоустойчивая, распределенная сетевая файловая система
-X-Alterator-Parent=server-v/70-storage
+X-Alterator-Parent=server-v/400-storage
--- a/pkg.in/groups/server-v/430-moosefs.directory
+++ b/pkg.in/groups/server-v/430-moosefs.directory
@ -6,4 +6,4 @@ Name[ru_RU]=MooseFS
 X-Alterator-Required=no
 Comment=Network Distributed File System
 Comment[ru_RU]=Oтказоустойчивая, распределенная сетевая файловая система
-X-Alterator-Parent=server-v/70-storage
+X-Alterator-Parent=server-v/400-storage
--- a/pkg.in/groups/server-v/450-nfs.directory
+++ b/pkg.in/groups/server-v/450-nfs.directory
@ -6,4 +6,4 @@ Name[ru_RU]=NFS
 X-Alterator-Required=no
 Comment=Network File System
 Comment[ru_RU]=Сетевая файловая система
-X-Alterator-Parent=server-v/70-storage
+X-Alterator-Parent=server-v/400-storage
--- a/pkg.in/groups/server-v/460-iscsi.directory
+++ b/pkg.in/groups/server-v/460-iscsi.directory
@ -6,4 +6,4 @@ Name[ru_RU]=iSCSI
 X-Alterator-Required=no
 Comment=iSCSI
 Comment[ru_RU]=iSCSI
-X-Alterator-Parent=server-v/70-storage
+X-Alterator-Parent=server-v/400-storage
--- a/pkg.in/groups/server-v/500-network.directory
+++ b/pkg.in/groups/server-v/500-network.directory
--- a/pkg.in/groups/server-v/600-monitoring.directory
+++ b/pkg.in/groups/server-v/600-monitoring.directory
--- a/pkg.in/groups/server-v/700-backup.directory
+++ b/pkg.in/groups/server-v/700-backup.directory
--- a/pkg.in/groups/server-v/800-logging.directory
+++ b/pkg.in/groups/server-v/800-logging.directory
--- a/pkg.in/groups/server-v/bacula.directory
+++ b/pkg.in/groups/server-v/bacula.directory
@ -5,4 +5,4 @@ Name=Bacula File service(also known as the Client program)
 Name[ru_RU]=Bacula клиент
 X-Alterator-PackageList=storage/bacula
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/100-backup
+X-Alterator-Parent=server-v/700-backup
--- a/pkg.in/groups/server-v/bird.directory
+++ b/pkg.in/groups/server-v/bird.directory
@ -5,4 +5,4 @@ Name=Bird - IP routing daemon
 Name[ru_RU]=Bird - демон маршрутизации
 X-Alterator-PackageList=network/bird
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/80-network
+X-Alterator-Parent=server-v/500-network
--- a/pkg.in/groups/server-v/burp.directory
+++ b/pkg.in/groups/server-v/burp.directory
@ -5,4 +5,4 @@ Name=Burp - backup and restore program
 Name[ru_RU]=Burp - архивирование и восстановление
 X-Alterator-PackageList=storage/burp
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/100-backup
+X-Alterator-Parent=server-v/700-backup
--- a/pkg.in/groups/server-v/ceph/client.directory
+++ b/pkg.in/groups/server-v/ceph/client.directory
@ -5,4 +5,4 @@ Name=Client
 Name[ru_RU]=Клиент
 X-Alterator-PackageList=storage/ceph-client
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/71-ceph
+X-Alterator-Parent=server-v/410-ceph
--- a/pkg.in/groups/server-v/ceph/mgr.directory
+++ b/pkg.in/groups/server-v/ceph/mgr.directory
@ -5,4 +5,4 @@ Name=MGR - Manager Daemon
 Name[ru_RU]=MGR - сервер управления кластером ceph
 X-Alterator-PackageList=storage/ceph-mgr
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/71-ceph
+X-Alterator-Parent=server-v/410-ceph
--- a/pkg.in/groups/server-v/ceph/mon.directory
+++ b/pkg.in/groups/server-v/ceph/mon.directory
@ -5,4 +5,4 @@ Name=MON - Cluster Monitor Daemon
 Name[ru_RU]=MON - сервер мониторинга кластера ceph
 X-Alterator-PackageList=storage/ceph-mon
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/71-ceph
+X-Alterator-Parent=server-v/410-ceph
--- a/pkg.in/groups/server-v/ceph/osd.directory
+++ b/pkg.in/groups/server-v/ceph/osd.directory
@ -5,4 +5,4 @@ Name=OSD - Object Storage Daemon
 Name[ru_RU]=OSD - сервер хранения объектов
 X-Alterator-PackageList=storage/ceph-osd
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/71-ceph
+X-Alterator-Parent=server-v/410-ceph
--- a/pkg.in/groups/server-v/ceph/radosgw.directory
+++ b/pkg.in/groups/server-v/ceph/radosgw.directory
@ -5,4 +5,4 @@ Name=Rados REST Gateway
 Name[ru_RU]=Rados REST Gateway
 X-Alterator-PackageList=storage/ceph-radosgw
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/71-ceph
+X-Alterator-Parent=server-v/410-ceph
--- a/pkg.in/groups/server-v/cockpit/docker.directory
+++ b/pkg.in/groups/server-v/cockpit/docker.directory
@ -6,5 +6,5 @@ Name[ru_RU]=Управление контейнерами docker
 X-Alterator-PackageList=virt/cockpit/docker
 X-Alterator-Required=no
 X-Alterator-Depends=server-v/docker
-X-Alterator-Parent=server-v/11-cockpit
+X-Alterator-Parent=server-v/111-cockpit

--- a/pkg.in/groups/server-v/cockpit/kvm.directory
+++ b/pkg.in/groups/server-v/cockpit/kvm.directory
@ -6,4 +6,4 @@ Name[ru_RU]=Управление виртуальными машинами KVM
 X-Alterator-PackageList=virt/cockpit/machines
 X-Alterator-Required=no
 X-Alterator-Depends=server-v/kvm
-X-Alterator-Parent=server-v/11-cockpit
+X-Alterator-Parent=server-v/111-cockpit
--- a/pkg.in/groups/server-v/cockpit/web.directory
+++ b/pkg.in/groups/server-v/cockpit/web.directory
@ -5,4 +5,4 @@ Name=Web Service
 Name[ru_RU]=Web интерфейс
 X-Alterator-PackageList=virt/cockpit/web
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/11-cockpit
+X-Alterator-Parent=server-v/111-cockpit
--- a/pkg.in/groups/server-v/collectd.directory
+++ b/pkg.in/groups/server-v/collectd.directory
@ -5,5 +5,5 @@ Name=Collectd
 Name[ru_RU]=Collectd
 X-Alterator-PackageList=monitoring/collectd
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring

--- a/pkg.in/groups/server-v/corosync_pacemaker.directory
+++ b/pkg.in/groups/server-v/corosync_pacemaker.directory
@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Directory
-Name=Corosync and Pacemaker
-Name[ru_RU]=Corosync и Pacemaker
+Name=HA Cluster (Corosync and Pacemaker)
+Name[ru_RU]=Отказоустойчивый кластер (Corosync и Pacemaker)
 X-Alterator-PackageList=cluster/corosync_pacemaker
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/65-cluster
+X-Alterator-Parent=server-v/300-cluster
--- a/pkg.in/groups/server-v/docker.directory
+++ b/pkg.in/groups/server-v/docker.directory
@ -5,4 +5,4 @@ Name=Docker
 Name[ru_RU]=Docker
 X-Alterator-PackageList=container/docker
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/60-container
+X-Alterator-Parent=server-v/200-container
--- a/pkg.in/groups/server-v/freeipa-client.directory
+++ b/pkg.in/groups/server-v/freeipa-client.directory
@ -5,4 +5,4 @@ Name=FreeIPA domain client
 Name[ru_RU]=Клиент домена FreeIPA
 X-Alterator-PackageList=workstation/freeipa-client
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/80-network
+X-Alterator-Parent=server-v/500-network
--- a/pkg.in/groups/server-v/glusterfs/client.directory
+++ b/pkg.in/groups/server-v/glusterfs/client.directory
@ -5,4 +5,4 @@ Name=Client
 Name[ru_RU]=Клиент
 X-Alterator-PackageList=storage/glusterfs-client
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/72-glusterfs
+X-Alterator-Parent=server-v/420-glusterfs
--- a/pkg.in/groups/server-v/glusterfs/server.directory
+++ b/pkg.in/groups/server-v/glusterfs/server.directory
@ -5,4 +5,4 @@ Name=Server
 Name[ru_RU]=Cервер
 X-Alterator-PackageList=storage/glusterfs-server
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/72-glusterfs
+X-Alterator-Parent=server-v/420-glusterfs
--- a/pkg.in/groups/server-v/grafana.directory
+++ b/pkg.in/groups/server-v/grafana.directory
@ -5,4 +5,4 @@ Name=Grafana Metrics Dashboard
 Name[ru_RU]=Grafana cервер для визуализации, мониторинга и анализа данных
 X-Alterator-PackageList=monitoring/grafana
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring
--- a/pkg.in/groups/server-v/haproxy.directory
+++ b/pkg.in/groups/server-v/haproxy.directory
@ -5,4 +5,4 @@ Name=HAProxy TCP/HTTP Load Balancer
 Name[ru_RU]=HAProxy TCP/HTTP балансировщик нагрузки
 X-Alterator-PackageList=network/haproxy
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/80-network
+X-Alterator-Parent=server-v/500-network
--- a/pkg.in/groups/server-v/influxdb.directory
+++ b/pkg.in/groups/server-v/influxdb.directory
@ -5,4 +5,4 @@ Name=InfluxDB time series database
 Name[ru_RU]=Сервер хранения временных рядов InfluxDB
 X-Alterator-PackageList=monitoring/influxdb
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring
--- a/pkg.in/groups/server-v/iscsi/initiator.directory
+++ b/pkg.in/groups/server-v/iscsi/initiator.directory
@ -5,4 +5,4 @@ Name=Initiator
 Name[ru_RU]=Инициатор (клиент)
 X-Alterator-PackageList=storage/open-iscsi
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/76-iscsi
+X-Alterator-Parent=server-v/460-iscsi
--- a/pkg.in/groups/server-v/iscsi/scsitarget.directory
+++ b/pkg.in/groups/server-v/iscsi/scsitarget.directory
@ -5,4 +5,4 @@ Name=iSCSI target daemon (User Mode)
 Name[ru_RU]=iSCSI target сервер (процесс пользователя)
 X-Alterator-PackageList=storage/scsitarget
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/76-iscsi
+X-Alterator-Parent=server-v/460-iscsi
--- a/pkg.in/groups/server-v/iscsi/targetcli.directory
+++ b/pkg.in/groups/server-v/iscsi/targetcli.directory
@ -5,5 +5,5 @@ Name=Targetcli managing LIO kernel target (Kernel Mode)
 Name[ru_RU]=Targetcli управление параметрами ядра LIO (процесс ядра)
 X-Alterator-PackageList=storage/targetcli
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/76-iscsi
+X-Alterator-Parent=server-v/460-iscsi

--- a/pkg.in/groups/server-v/keepalived.directory
+++ b/pkg.in/groups/server-v/keepalived.directory
@ -5,4 +5,4 @@ Name=Keepalived Loadbalancing and High-availability
 Name[ru_RU]=Keepalived балансировщик нагрузки и отказоустойчивость
 X-Alterator-PackageList=network/keepalived
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/80-network
+X-Alterator-Parent=server-v/500-network
--- a/pkg.in/groups/server-v/kubernetes.directory
+++ b/pkg.in/groups/server-v/kubernetes.directory
@ -5,4 +5,4 @@ Name=Kubernetes
 Name[ru_RU]=Kubernetes
 X-Alterator-PackageList=container/kubernetes
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/60-container
+X-Alterator-Parent=server-v/200-container
--- a/pkg.in/groups/server-v/kvm.directory
+++ b/pkg.in/groups/server-v/kvm.directory
@ -5,4 +5,4 @@ Name=KVM virtualization server
 Name[ru_RU]=Сервер виртуализации (KVM)
 X-Alterator-PackageList=virt/kvm
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/10-basic
+X-Alterator-Parent=server-v/110-basic
--- a/pkg.in/groups/server-v/lizardfs/cgiserv.directory
+++ b/pkg.in/groups/server-v/lizardfs/cgiserv.directory
@ -5,4 +5,4 @@ Name=Web UI Server
 Name[ru_RU]=Web интерфейс
 X-Alterator-PackageList=storage/lizardfs-cgiserv
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/74-lizardfs
+X-Alterator-Parent=server-v/430-lizardfs
--- a/pkg.in/groups/server-v/lizardfs/chunkserver.directory
+++ b/pkg.in/groups/server-v/lizardfs/chunkserver.directory
@ -7,4 +7,4 @@ Comment=LizardFS Chunkserver for data storage servers
 Comment[ru_RU]=LizardFS Cервер хранения данных
 X-Alterator-PackageList=storage/lizardfs-chunkserver
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/74-lizardfs
+X-Alterator-Parent=server-v/430-lizardfs
--- a/pkg.in/groups/server-v/lizardfs/client.directory
+++ b/pkg.in/groups/server-v/lizardfs/client.directory
@ -5,4 +5,4 @@ Name=Client
 Name[ru_RU]=Клиент
 X-Alterator-PackageList=storage/lizardfs-client
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/74-lizardfs
+X-Alterator-Parent=server-v/430-lizardfs
--- a/pkg.in/groups/server-v/lizardfs/master.directory
+++ b/pkg.in/groups/server-v/lizardfs/master.directory
@ -7,4 +7,4 @@ Comment=LizardFS Master Server for metadata servers
 Comment[ru_RU]=LizardFS Мастер сервер метаданных
 X-Alterator-PackageList=storage/lizardfs-master
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/74-lizardfs
+X-Alterator-Parent=server-v/430-lizardfs
--- a/pkg.in/groups/server-v/lizardfs/metalogger.directory
+++ b/pkg.in/groups/server-v/lizardfs/metalogger.directory
@ -8,4 +8,4 @@ Comment[ru_RU]=Metalogger сервер для синхронизации и ре
 X-Alterator-PackageList=storage/lizardfs-metalogger
 X-Alterator-Required=no
 X-Alterator-Conflicts=server-v/lizardfs/master
-X-Alterator-Parent=server-v/74-lizardfs
+X-Alterator-Parent=server-v/430-lizardfs
--- a/pkg.in/groups/server-v/lxd.directory
+++ b/pkg.in/groups/server-v/lxd.directory
@ -5,4 +5,4 @@ Name=LXD
 Name[ru_RU]=LXD
 X-Alterator-PackageList=container/lxd
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/60-container
+X-Alterator-Parent=server-v/200-container
--- a/pkg.in/groups/server-v/monit.directory
+++ b/pkg.in/groups/server-v/monit.directory
@ -5,5 +5,5 @@ Name=Monit
 Name[ru_RU]=Monit
 X-Alterator-PackageList=monitoring/monit
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring

--- a/pkg.in/groups/server-v/moosefs/cgiserv.directory
+++ b/pkg.in/groups/server-v/moosefs/cgiserv.directory
@ -5,4 +5,4 @@ Name=Web UI Server
 Name[ru_RU]=Web интерфейс
 X-Alterator-PackageList=storage/moosefs-cgiserv
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/74-moosefs
+X-Alterator-Parent=server-v/430-moosefs
--- a/pkg.in/groups/server-v/moosefs/chunkserver.directory
+++ b/pkg.in/groups/server-v/moosefs/chunkserver.directory
@ -7,4 +7,4 @@ Comment=MooseFS Chunkserver for data storage servers
 Comment[ru_RU]=MooseFS Cервер хранения данных
 X-Alterator-PackageList=storage/moosefs-chunkserver
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/74-moosefs
+X-Alterator-Parent=server-v/430-moosefs
--- a/pkg.in/groups/server-v/moosefs/client.directory
+++ b/pkg.in/groups/server-v/moosefs/client.directory
@ -5,4 +5,4 @@ Name=Client
 Name[ru_RU]=Клиент
 X-Alterator-PackageList=storage/moosefs-client
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/74-moosefs
+X-Alterator-Parent=server-v/430-moosefs
--- a/pkg.in/groups/server-v/moosefs/master.directory
+++ b/pkg.in/groups/server-v/moosefs/master.directory
@ -7,4 +7,4 @@ Comment=MooseFS Master Server for metadata servers
 Comment[ru_RU]=MooseFS Мастер сервер метаданных
 X-Alterator-PackageList=storage/moosefs-master
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/74-moosefs
+X-Alterator-Parent=server-v/430-moosefs
--- a/pkg.in/groups/server-v/moosefs/metalogger.directory
+++ b/pkg.in/groups/server-v/moosefs/metalogger.directory
@ -8,4 +8,4 @@ Comment[ru_RU]=Metalogger сервер для синхронизации и ре
 X-Alterator-PackageList=storage/moosefs-metalogger
 X-Alterator-Required=no
 X-Alterator-Conflicts=server-v/moosefs/master
-X-Alterator-Parent=server-v/74-moosefs
+X-Alterator-Parent=server-v/430-moosefs
--- a/pkg.in/groups/server-v/nagios-nrpe.directory
+++ b/pkg.in/groups/server-v/nagios-nrpe.directory
@ -7,4 +7,4 @@ Comment=NRPE - Nagios Remote Plugin Executor
 Comment[ru_RU]=NRPE - Удаленный запуск команд для Nagios
 X-Alterator-PackageList=monitoring/nagios-nrpe
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring
--- a/pkg.in/groups/server-v/ocfs2.directory
+++ b/pkg.in/groups/server-v/ocfs2.directory
@ -5,4 +5,4 @@ Name=OCFS2(Oracle Cluster FS) management utilities
 Name[ru_RU]=Утилиты управления OCFS2 (Oracle Cluster FS)
 X-Alterator-PackageList=storage/ocfs2
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/70-storage
+X-Alterator-Parent=server-v/400-storage
--- a/pkg.in/groups/server-v/opennebula/flow.directory
+++ b/pkg.in/groups/server-v/opennebula/flow.directory
@ -5,4 +5,4 @@ Name=OneFlow manages services and elasticity
 Name[ru_RU]=OneFlow управление сервисами
 X-Alterator-PackageList=virt/opennebula/flow
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/30-opennebula
+X-Alterator-Parent=server-v/130-opennebula
--- a/pkg.in/groups/server-v/opennebula/gate.directory
+++ b/pkg.in/groups/server-v/opennebula/gate.directory
@ -5,4 +5,4 @@ Name=OneGate server that enables communication between VMs and OpenNebula
 Name[ru_RU]=OneGate сервер сообщение между VM и OpenNebula
 X-Alterator-PackageList=virt/opennebula/gate
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/30-opennebula
+X-Alterator-Parent=server-v/130-opennebula
--- a/pkg.in/groups/server-v/opennebula/gui.directory
+++ b/pkg.in/groups/server-v/opennebula/gui.directory
@ -5,4 +5,4 @@ Name=Sunstone Web GUI and the EC2 API
 Name[ru_RU]=Sunstone Web-интерфейс и EC2 API
 X-Alterator-PackageList=virt/opennebula/gui
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/30-opennebula
+X-Alterator-Parent=server-v/130-opennebula
--- a/pkg.in/groups/server-v/opennebula/node-kvm.directory
+++ b/pkg.in/groups/server-v/opennebula/node-kvm.directory
@ -7,4 +7,4 @@ X-Alterator-PackageList=virt/opennebula/node-kvm
 X-Alterator-Required=no
 X-Alterator-Conflicts=server-v/opennebula/server server-virt/opennebula/gui server-virt/opennebula/gate server-virt/opennebula/flow
 X-Alterator-Depends=server-v/kvm
-X-Alterator-Parent=server-v/30-opennebula
+X-Alterator-Parent=server-v/130-opennebula
--- a/pkg.in/groups/server-v/opennebula/node-lxd.directory
+++ b/pkg.in/groups/server-v/opennebula/node-lxd.directory
@ -7,4 +7,4 @@ X-Alterator-PackageList=virt/opennebula/node-lxd
 X-Alterator-Required=no
 X-Alterator-Conflicts=server-v/opennebula/server server-virt/opennebula/gui server-virt/opennebula/gate server-virt/opennebula/flow
 X-Alterator-Depends=server-v/lxd
-X-Alterator-Parent=server-v/30-opennebula
+X-Alterator-Parent=server-v/130-opennebula
--- a/pkg.in/groups/server-v/opennebula/server.directory
+++ b/pkg.in/groups/server-v/opennebula/server.directory
@ -5,4 +5,4 @@ Name=Main OpenNebula daemon and scheduler
 Name[ru_RU]=Основной сервер Opennebula и планировщик
 X-Alterator-PackageList=virt/opennebula/server
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/30-opennebula
+X-Alterator-Parent=server-v/130-opennebula
--- a/pkg.in/groups/server-v/openstack/block.directory
+++ b/pkg.in/groups/server-v/openstack/block.directory
@ -5,4 +5,4 @@ Name=Block Storage Node
 Name[ru_RU]=Узел хранения блочных устройств
 X-Alterator-PackageList=virt/openstack/block
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/40-openstack
+X-Alterator-Parent=server-v/140-openstack
--- a/pkg.in/groups/server-v/openstack/compute.directory
+++ b/pkg.in/groups/server-v/openstack/compute.directory
@ -7,4 +7,4 @@ X-Alterator-PackageList=virt/openstack/compute
 X-Alterator-Required=no
 X-Alterator-Conflicts=server-v/openstack-block server-virt/openstack-controller server-virt/openstack-network server-virt/openstack-storage
 X-Alterator-Depends=server-v/kvm
-X-Alterator-Parent=server-v/40-openstack
+X-Alterator-Parent=server-v/140-openstack
--- a/pkg.in/groups/server-v/openstack/controller.directory
+++ b/pkg.in/groups/server-v/openstack/controller.directory
@ -5,4 +5,4 @@ Name=Controller Node
 Name[ru_RU]=Управляющий узел
 X-Alterator-PackageList=virt/openstack/controller
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/40-openstack
+X-Alterator-Parent=server-v/140-openstack
--- a/pkg.in/groups/server-v/openstack/network.directory
+++ b/pkg.in/groups/server-v/openstack/network.directory
@ -5,4 +5,4 @@ Name=Network Node
 Name[ru_RU]=Сетевой узел
 X-Alterator-PackageList=virt/openstack/network
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/40-openstack
+X-Alterator-Parent=server-v/140-openstack
--- a/pkg.in/groups/server-v/openstack/storage.directory
+++ b/pkg.in/groups/server-v/openstack/storage.directory
@ -5,4 +5,4 @@ Name=Storage Node
 Name[ru_RU]=Узел хранения объектов
 X-Alterator-PackageList=virt/openstack/storage
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/40-openstack
+X-Alterator-Parent=server-v/140-openstack
--- a/pkg.in/groups/server-v/openvswitch.directory
+++ b/pkg.in/groups/server-v/openvswitch.directory
@ -5,4 +5,4 @@ Name=OpenvSwitch
 Name[ru_RU]=OpenvSwitch
 X-Alterator-PackageList=network/openvswitch
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/80-network
+X-Alterator-Parent=server-v/500-network
--- a/pkg.in/groups/server-v/podman.directory
+++ b/pkg.in/groups/server-v/podman.directory
@ -5,4 +5,4 @@ Name=Podman
 Name[ru_RU]=Podman
 X-Alterator-PackageList=container/podman
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/60-container
+X-Alterator-Parent=server-v/200-container
--- a/pkg.in/groups/server-v/prometheus-node_exporter.directory
+++ b/pkg.in/groups/server-v/prometheus-node_exporter.directory
@ -5,4 +5,4 @@ Name=Prometheus exporter for hardware and OS metrics
 Name[ru_RU]=Агент сбора метрик Prometheus
 X-Alterator-PackageList=monitoring/prometheus-node_exporter
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring
--- a/pkg.in/groups/server-v/prometheus.directory
+++ b/pkg.in/groups/server-v/prometheus.directory
@ -5,4 +5,4 @@ Name=Prometheus monitoring system
 Name[ru_RU]=Сервер мониторинга Prometheus
 X-Alterator-PackageList=monitoring/prometheus
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring
--- a/pkg.in/groups/server-v/pve.directory
+++ b/pkg.in/groups/server-v/pve.directory
@ -6,4 +6,4 @@ Name[ru_RU]=PVE Сервер
 X-Alterator-PackageList=virt/pve
 X-Alterator-Required=no
 X-Alterator-Conflicts=server-v/kvm
-X-Alterator-Parent=server-v/20-pve
+X-Alterator-Parent=server-v/120-pve
--- a/pkg.in/groups/server-v/rkt.directory
+++ b/pkg.in/groups/server-v/rkt.directory
@ -5,4 +5,4 @@ Name=rkt
 Name[ru_RU]=rkt
 X-Alterator-PackageList=container/rkt
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/60-container
+X-Alterator-Parent=server-v/200-container
--- a/pkg.in/groups/server-v/rsyslog-classic.directory
+++ b/pkg.in/groups/server-v/rsyslog-classic.directory
@ -7,4 +7,4 @@ Comment=Classic syslog configuration with local logging to /var/log from /dev/lo
 Comment[ru_RU]=Классический демон для локального логирования /dev/log
 X-Alterator-PackageList=logging/rsyslog-classic
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/110-logging
+X-Alterator-Parent=server-v/800-logging
--- a/pkg.in/groups/server-v/systemd-journal-remote.directory
+++ b/pkg.in/groups/server-v/systemd-journal-remote.directory
@ -7,4 +7,4 @@ Comment=Serves journal events over the network
 Comment[ru_RU]=Службы доступа и отправки журналов systemd через сеть
 X-Alterator-PackageList=logging/systemd-journal-remote
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/110-logging
+X-Alterator-Parent=server-v/800-logging
--- a/pkg.in/groups/server-v/telegraf.directory
+++ b/pkg.in/groups/server-v/telegraf.directory
@ -5,5 +5,5 @@ Name=Telegraf Agent agent for collecting
 Name[ru_RU]=Агент сбора метрик Telegraf
 X-Alterator-PackageList=monitoring/telegraf
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring

--- a/pkg.in/groups/server-v/zabbix-agent.directory
+++ b/pkg.in/groups/server-v/zabbix-agent.directory
@ -5,5 +5,5 @@ Name=Zabbix Agent
 Name[ru_RU]=Агент Zabbix
 X-Alterator-PackageList=monitoring/zabbix-agent
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring

--- a/pkg.in/groups/server-v/zabbix.directory
+++ b/pkg.in/groups/server-v/zabbix.directory
@ -5,5 +5,5 @@ Name=Zabbix Monitoring Server
 Name[ru_RU]=Сервер мониторинга Zabbix
 X-Alterator-PackageList=tagged/server+zabbix
 X-Alterator-Required=no
-X-Alterator-Parent=server-v/90-monitoring
+X-Alterator-Parent=server-v/600-monitoring

--- a/pkg.in/profiles/server-v/110-basic.directory
+++ b/pkg.in/profiles/server-v/110-basic.directory
--- a/pkg.in/profiles/server-v/120-pve.directory
+++ b/pkg.in/profiles/server-v/120-pve.directory
--- a/pkg.in/profiles/server-v/131-opennebula-node.directory
+++ b/pkg.in/profiles/server-v/131-opennebula-node.directory
--- a/pkg.in/profiles/server-v/132-opennebula-server.directory
+++ b/pkg.in/profiles/server-v/132-opennebula-server.directory
--- a/pkg.in/profiles/server-v/141-openstack-node.directory
+++ b/pkg.in/profiles/server-v/141-openstack-node.directory
--- a/pkg.in/profiles/server-v/142-openstack-controller.directory
+++ b/pkg.in/profiles/server-v/142-openstack-controller.directory
--- a/pkg.in/profiles/server-v/201-docker.directory
+++ b/pkg.in/profiles/server-v/201-docker.directory