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. :)

regular.mk: rework server{,-ovz}
143e1038 · Michael Shigorin · d5da95ba · 143e1038
Commit 143e1038 authored Apr 20, 2016 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

regular.mk conf.d/regular.mk +4 -4

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -237,15 +237,15 @@ distro/.regular-server: distro/.regular-install \
 	@$(call add,CLEANUP_PACKAGES,qt4-common)
 	@$(call add,DEFAULT_SERVICES_DISABLE,bridge)

-distro/regular-server: distro/.regular-server use/cleanup/x11-alterator; @:
-
 distro/.regular-server-managed: distro/.regular-server
 	@$(call add,THE_PACKAGES,alterator-fbi)
 	@$(call add,THE_LISTS,$(call tags,server alterator))
 	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)

-distro/regular-server-ovz: distro/.regular-server-managed \
-	use/server/ovz use/server/groups/base
+distro/regular-server: distro/.regular-server-managed 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)

 distro/regular-server-hyperv: distro/.regular-server-managed