diff --git a/conf.d/alt-server.mk b/conf.d/alt-server.mk index 13e495c1..f9b17018 100644 --- a/conf.d/alt-server.mk +++ b/conf.d/alt-server.mk @@ -3,13 +3,16 @@ 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 freeipa-server freenx-server \ - ipmi v12n-server netinst sogo virt-manager) + blogs emulators gnome-peer-to-peer freenx-server \ + ipmi netinst sogo) -#ifeq (,$(filter-out x86_64,$(ARCH))) -#distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\ -# ) -#endif +distro/alt-server: monitoring = $(addprefix server-v/, 90-monitoring \ + zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe) + +ifeq (,$(filter-out x86_64,$(ARCH))) +distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\ + ganeti freeipa-server v12n-server) +endif # FIXME: generalize vm-profile distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \ diff --git a/pkg.in/groups/centaurus/owncloud.directory b/pkg.in/groups/centaurus/owncloud.directory index 5116754c..6a3b36fa 100644 --- a/pkg.in/groups/centaurus/owncloud.directory +++ b/pkg.in/groups/centaurus/owncloud.directory @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 Type=Directory -Name=Owncloud +Name=Nextcloud X-Alterator-PackageList=centaurus/owncloud X-Alterator-Required=no X-Alterator-Parent=centaurus/20-server-apps -Name[ru_RU]=Сервер Owncloud +Name[ru_RU]=Сервер Nextcloud Categories=Server;Networking diff --git a/pkg.in/lists/centaurus/base-server b/pkg.in/lists/centaurus/base-server index 0bf01c65..1eeadf75 100644 --- a/pkg.in/lists/centaurus/base-server +++ b/pkg.in/lists/centaurus/base-server @@ -81,8 +81,6 @@ audit strace # ? -acpid@X86 -mkbootflash@X86 rp-pppoe-base # ldap diff --git a/pkg.in/lists/centaurus/disk-dvd b/pkg.in/lists/centaurus/disk-dvd index f941705a..667113fc 100644 --- a/pkg.in/lists/centaurus/disk-dvd +++ b/pkg.in/lists/centaurus/disk-dvd @@ -17,14 +17,8 @@ etckeeper #kernel kernel-build-tools kernel-doc-std -###kernel-headers-modules-@KERNEL@ -###kernel-headers-@KERNEL@ -###kernel-modules-staging-@KERNEL@ -kernel-source-4.9 c-icap -###libspice-gtk -###python-module-spice-gtk virt-viewer b43-fwcutter @@ -93,7 +87,7 @@ libqt4-sql-postgresql libini -mongo-server +mongo-server@x86_64 python-module-PyQt4 python-module-ZSI rdesktop diff --git a/pkg.in/profiles/centaurus/10-server.directory b/pkg.in/profiles/centaurus/10-server.directory index 19c10494..ca69d5be 100644 --- a/pkg.in/profiles/centaurus/10-server.directory +++ b/pkg.in/profiles/centaurus/10-server.directory @@ -2,4 +2,4 @@ Type=Directory Name=Office Server Name[ru_RU]=Офисный сервер -X-Alterator-Groups=centaurus/dhcp-server-a centaurus/dns-server-a centaurus/ftp-server-a centaurus/mail-server-a centaurus/mysql-server-a centaurus/netinst centaurus/freenx-server centaurus/http-server centaurus/dns-server centaurus/bacula-server centaurus/kvm-server centaurus/xorg centaurus/docs centaurus/samba centaurus/domain-server centaurus/alterator centaurus/owncloud centaurus/mediawiki centaurus/mate centaurus/office centaurus/cups +X-Alterator-Groups=centaurus/dhcp-server-a centaurus/dns-server-a centaurus/ftp-server-a centaurus/mail-server-a centaurus/mysql-server-a centaurus/netinst centaurus/http-server centaurus/dns-server centaurus/bacula-server centaurus/kvm-server centaurus/xorg centaurus/docs centaurus/samba centaurus/domain-server centaurus/alterator centaurus/owncloud centaurus/mediawiki centaurus/mate centaurus/office centaurus/cups