regular.mk: rework server{,-ovz}

My failure to recognize that it is a "generic" server that
might need some generalization and not an already specialized
one like OpenVZ HN installer had to be fixed up some day;
today is fine.

Basically, let's move package groups ("checkboxes") and alterator
from server-ovz to server, and maybe beef it up a lil' bit more
later; server-ovz is still far from jeos-ovz but the difference
that looks unmergeable is strict sshd control setup that's going
to bite those unsuspecting, so let's leave it for those of us
who are more suspicious of stray ISOs. :)
This commit is contained in:
Michael Shigorin 2016-04-20 18:44:10 +03:00
parent d5da95ba72
commit 143e1038ca

View File

@ -237,15 +237,15 @@ distro/.regular-server: distro/.regular-install \
@$(call add,CLEANUP_PACKAGES,qt4-common) @$(call add,CLEANUP_PACKAGES,qt4-common)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge) @$(call add,DEFAULT_SERVICES_DISABLE,bridge)
distro/regular-server: distro/.regular-server use/cleanup/x11-alterator; @:
distro/.regular-server-managed: distro/.regular-server distro/.regular-server-managed: distro/.regular-server
@$(call add,THE_PACKAGES,alterator-fbi) @$(call add,THE_PACKAGES,alterator-fbi)
@$(call add,THE_LISTS,$(call tags,server alterator)) @$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord) @$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
distro/regular-server-ovz: distro/.regular-server-managed \ distro/regular-server: distro/.regular-server-managed use/server/groups/base; @:
use/server/ovz use/server/groups/base
distro/regular-server-ovz: distro/.regular-server \
use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
@$(call add,MAIN_GROUPS,vzstats) @$(call add,MAIN_GROUPS,vzstats)
distro/regular-server-hyperv: distro/.regular-server-managed distro/regular-server-hyperv: distro/.regular-server-managed