keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: generalize server-ovz configuration bits

Browse Source 
OpenVZ related part is now a reusable use/server/ovz target,
and service related groups which have been largely taken from
rider@'s server-light project are now use/server/groups/base.
This commit is contained in:
Michael Shigorin 2014-02-26 15:37:05 +04:00
parent 31084651f7
commit 0da7ae547c
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
conf.d/server.mk
View File

@ -11,18 +11,11 @@ distro/server-nano: distro/.server-base use/bootloader/lilo +power
distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
use/efi use/stage2/net-eth
@$(call set,INSTALLER,altlinux-server)
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
use/firmware/server use/firmware/cpu use/power/acpi/button +wireless
@$(call set,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el)
@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
@$(call add,MAIN_KMODULES,xtables-addons) # t6/branch
@$(call add,MAIN_KMODULES,drbd83 kvm)
@$(call add,BASE_LISTS,ovz-server)
@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
@$(call add,MAIN_GROUPS,monitoring diag-tools)
distro/server-ovz: distro/server-mini use/server/ovz use/server/groups/base \
use/install2/net use/hdt use/rescue use/power/acpi/button \
use/firmware/server use/firmware/cpu +wireless; @:
endif

13
features.in/server/config.mk
View File

@ -9,3 +9,16 @@ use/server/mini: use/server use/net-ssh
@$(call add,THE_LISTS,$(call tags,extra && (server || network)))
@$(call add,MAIN_LISTS,osec)
@$(call add,DEFAULT_SERVICES_DISABLE,messagebus lvm2-lvmetad)
use/server/ovz: use/server
@$(call set,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el)
@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
@$(call add,MAIN_KMODULES,xtables-addons) # t6/branch
@$(call add,MAIN_KMODULES,drbd83 kvm)
@$(call add,BASE_LISTS,ovz-server)
use/server/groups/base: use/server
@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
@$(call add,MAIN_GROUPS,monitoring diag-tools)