diff --git a/conf.d/alt-server.mk b/conf.d/alt-server.mk index f9b17018..490d5089 100644 --- a/conf.d/alt-server.mk +++ b/conf.d/alt-server.mk @@ -3,7 +3,7 @@ ifeq (distro,$(IMAGE_CLASS)) ifeq (,$(filter-out i586 x86_64,$(ARCH))) distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\ - blogs emulators gnome-peer-to-peer freenx-server \ + emulators freenx-server \ ipmi netinst sogo) distro/alt-server: monitoring = $(addprefix server-v/, 90-monitoring \ diff --git a/conf.d/mixin-alt-server.mk b/conf.d/mixin-alt-server.mk index 45451451..26dbd0a5 100644 --- a/conf.d/mixin-alt-server.mk +++ b/conf.d/mixin-alt-server.mk @@ -1,5 +1,5 @@ mixin/alt-server: server_groups = $(addprefix centaurus/,\ - 10-alterator 20-server-apps 30-cups 50-freeipa 70-dev 80-desktop 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a graphics-editing gtk-dictionary mail-server-a mate mediawiki monitoring office owncloud pidgin publishing remmina scanning sound-editing vlc xorg domain-server freeipa-client samba) + 10-alterator 20-server-apps 50-freeipa 70-dev 80-desktop 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a mail-server-a mate mediawiki office owncloud pidgin vlc xorg domain-server freeipa-client) mixin/alt-server: +installer +systemd \ use/branding/complete use/control use/services \ @@ -43,5 +43,5 @@ mixin/alt-server: +installer +systemd \ @$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind) @$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_VOL_SET,ALT) - @$(call set,META_VOL_ID,ALT Server) - @$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH)) + @$(call set,META_VOL_ID,ALT Server 9.0 $(ARCH)) + @$(call set,META_APP_ID,ALT Server 9.0 $(ARCH) $(shell date +%F)) diff --git a/pkg.in/groups/centaurus/sambaDC.directory b/pkg.in/groups/centaurus/sambaDC.directory index ff5680f5..34ee3c88 100644 --- a/pkg.in/groups/centaurus/sambaDC.directory +++ b/pkg.in/groups/centaurus/sambaDC.directory @@ -3,7 +3,7 @@ Encoding=UTF-8 Type=Directory Name=SambaDC Server (AD controller) X-Alterator-PackageList=centaurus/sambaDC -X-Alterator-Required=no +X-Alterator-Required=yes X-Alterator-Parent=centaurus/20-server-apps Name[ru_RU]=Сервер SambaDC (контроллер AD) Categories=Server;Networking