From d6734efd2889381ac3aa8777b9572db26c7a8a79 Mon Sep 17 00:00:00 2001 From: "Anton V. Boyarshinov" Date: Tue, 18 Jun 2019 15:42:50 +0300 Subject: [PATCH] buildable alt server --- conf.d/alt-server.mk | 4 +--- conf.d/mixin-alt-server.mk | 2 +- pkg.in/lists/centaurus/10-alterator | 1 - pkg.in/lists/centaurus/disk | 5 ++--- pkg.in/lists/centaurus/disk-dvd | 14 ++++---------- pkg.in/lists/centaurus/disk-server-light | 6 ------ pkg.in/lists/centaurus/domain-client | 2 +- pkg.in/lists/centaurus/mate | 6 +----- pkg.in/lists/centaurus/mediawiki | 1 - pkg.in/lists/centaurus/monitoring | 1 - pkg.in/lists/centaurus/owncloud | 1 - pkg.in/lists/centaurus/xorg | 1 - 12 files changed, 10 insertions(+), 34 deletions(-) diff --git a/conf.d/alt-server.mk b/conf.d/alt-server.mk index dcdd7ffc..4a6827aa 100644 --- a/conf.d/alt-server.mk +++ b/conf.d/alt-server.mk @@ -8,8 +8,7 @@ distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\ ifeq (,$(filter-out x86_64,$(ARCH))) distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\ - 40-pve 60-openstack openstack-block openstack-compute \ - openstack-controller openstack-network openstack-storage) + 40-pve ) endif # FIXME: generalize vm-profile @@ -18,7 +17,6 @@ distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \ use/docs/license @$(call add,MAIN_GROUPS,$(server_groups_x86)) @$(call add,MAIN_GROUPS,$(server_groups_x86_64)) - @$(call add,MAIN_LISTS,centaurus/cluster) @$(call add,MAIN_LISTS,centaurus/disk-dvd) @$(call add,MAIN_LISTS,centaurus/disk-server-light) @$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2) diff --git a/conf.d/mixin-alt-server.mk b/conf.d/mixin-alt-server.mk index 1a6cecc2..45451451 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 bacula-client-a bacula-client bacula bacula-server 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 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) mixin/alt-server: +installer +systemd \ use/branding/complete use/control use/services \ diff --git a/pkg.in/lists/centaurus/10-alterator b/pkg.in/lists/centaurus/10-alterator index a7558ef7..2bc25cfd 100644 --- a/pkg.in/lists/centaurus/10-alterator +++ b/pkg.in/lists/centaurus/10-alterator @@ -44,7 +44,6 @@ alterator-xinetd squid -bacula-director-sqlite3 xauth branding-alt-server-alterator@X86 diff --git a/pkg.in/lists/centaurus/disk b/pkg.in/lists/centaurus/disk index 9fb7a926..1b2ee86e 100644 --- a/pkg.in/lists/centaurus/disk +++ b/pkg.in/lists/centaurus/disk @@ -1,4 +1,3 @@ -apache2-mod_php5 -postgresql9.6-server -postgresql9.6-1C-server +apache2-mod_php7 +postgresql11-server tftp diff --git a/pkg.in/lists/centaurus/disk-dvd b/pkg.in/lists/centaurus/disk-dvd index 96cd90e3..f941705a 100644 --- a/pkg.in/lists/centaurus/disk-dvd +++ b/pkg.in/lists/centaurus/disk-dvd @@ -47,18 +47,13 @@ opensc alterator-fbi -^libopensync0-* -msynctool0 - # wacom driver and utilities xorg-drv-wacom bridge-utils #bacula -bacula-bat -bacula-director-mysql -bacula-director-postgresql +### anonftp @@ -80,12 +75,12 @@ lsb python-module-Crypto postgresql-jdbc -postgresql9.6-1C-server +#postgresql10-1C-server mariadb-server -php5-soap -php5-calendar +php7-soap +php7-calendar fprintd pam_fprintd @@ -96,7 +91,6 @@ libqt4-sql-mysql libqt4-sql-postgresql -libopenmotif3 libini mongo-server diff --git a/pkg.in/lists/centaurus/disk-server-light b/pkg.in/lists/centaurus/disk-server-light index 354b872d..ad931041 100644 --- a/pkg.in/lists/centaurus/disk-server-light +++ b/pkg.in/lists/centaurus/disk-server-light @@ -27,7 +27,6 @@ gear hasher help2man indent -jdkgcj john ltrace patchutils @@ -90,8 +89,6 @@ libzmalloc # etc apt-rsync -bash-doc -bash-examples bash-completion bind-doc bzip2-doc @@ -99,9 +96,7 @@ bzlib-devel-static cfdisk db4.7-utils dnet -dovecot-doc expat -gd2-utils gpm iproute2-doc iptables-ipv6 @@ -109,7 +104,6 @@ isoutils kbdrate look lua5 -lua5-doc nfs-clients nfs-server openssh-askpass-common diff --git a/pkg.in/lists/centaurus/domain-client b/pkg.in/lists/centaurus/domain-client index 6e3aa42d..7ce0f808 100644 --- a/pkg.in/lists/centaurus/domain-client +++ b/pkg.in/lists/centaurus/domain-client @@ -1,6 +1,6 @@ pam_mount -samba4-client +samba-client cifs-utils keyutils nfs-clients diff --git a/pkg.in/lists/centaurus/mate b/pkg.in/lists/centaurus/mate index 1201021d..d6676e61 100644 --- a/pkg.in/lists/centaurus/mate +++ b/pkg.in/lists/centaurus/mate @@ -9,7 +9,7 @@ udev-alsa virtualbox-guest-additions@X86 -samba4-client +samba-client nfs-clients autofs installer-feature-nfs-client-stage3 @@ -28,8 +28,6 @@ arj pinfo wget -uniconvertor@X86 - #printing cups printer-drivers-base @@ -90,7 +88,6 @@ alterator-net-shares pinentry-gtk2 firefox-esr mate-default -mate-user-share mate-file-manager-archiver totem-video-thumbnailer@X86 installer-feature-samba-usershares-stage2 @@ -100,7 +97,6 @@ gksu branding-alt-server-graphics@X86 lightdm-gtk-greeter lightdm -branding-alt-server-mate-settings@X86 dconf #ConsoleKit #ConsoleKit-x11 diff --git a/pkg.in/lists/centaurus/mediawiki b/pkg.in/lists/centaurus/mediawiki index 00f89560..09d8abe0 100644 --- a/pkg.in/lists/centaurus/mediawiki +++ b/pkg.in/lists/centaurus/mediawiki @@ -1,5 +1,4 @@ mariadb-server -libmysqlclient18 mediawiki-mysql mediawiki mediawiki-ldap diff --git a/pkg.in/lists/centaurus/monitoring b/pkg.in/lists/centaurus/monitoring index ef1eedcd..d282cc89 100644 --- a/pkg.in/lists/centaurus/monitoring +++ b/pkg.in/lists/centaurus/monitoring @@ -12,6 +12,5 @@ collectd-ipmi collectd-libvirt@X86 collectd-mysql collectd-nginx -collectd-openvz@X86 collectd-ping collectd-sensors diff --git a/pkg.in/lists/centaurus/owncloud b/pkg.in/lists/centaurus/owncloud index 9d839d59..8e1d5a73 100644 --- a/pkg.in/lists/centaurus/owncloud +++ b/pkg.in/lists/centaurus/owncloud @@ -1,5 +1,4 @@ mariadb-server -libmysqlclient18 owncloud owncloud-apache2 diff --git a/pkg.in/lists/centaurus/xorg b/pkg.in/lists/centaurus/xorg index 2726188b..3dfa9395 100644 --- a/pkg.in/lists/centaurus/xorg +++ b/pkg.in/lists/centaurus/xorg @@ -10,7 +10,6 @@ xorg-drv-fbdev xorg-drv-joystick xorg-drv-mga@X86 xorg-drv-nouveau@X86 -xorg-drv-nv@X86 xorg-drv-modesetting xorg-drv-vboxvideo@X86 xorg-drv-synaptics