server.mk, test.mk: added zabbix images

server-zabbix.iso is ready for deployment, and live-zabbix.iso is zabbix agent + firefox (needs at least Server to be specified properly within zabbix_agentd.conf when booted).

server.mk, test.mk: added zabbix images
05371a6c · Michael Shigorin · 490ec2ec · 05371a6c · 05371a6c
Commit 05371a6c authored Apr 14, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

server.mk conf.d/server.mk +2 -0

test.mk conf.d/test.mk +7 -0

No files found.
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -19,4 +19,6 @@ distro/server-ovz: distro/server-mini use/server/ovz use/server/groups/base \
 	use/install2/net use/hdt use/rescue \
 	use/firmware/server use/firmware/cpu +wireless; @:

+distro/server-zabbix: distro/server-mini use/server/zabbix; @:
+
 endif
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -17,6 +17,11 @@ distro/live-gns3: distro/live-icewm
 	@$(call add,LIVE_LISTS,gns3)
 	@$(call add,LIVE_KMODULES,kvm virtualbox)

+# NB: requires runtime Server/ServerActive setup in zabbix_agentd.conf
+distro/live-zabbix: distro/live-icewm use/net-eth
+	@$(call add,THE_PACKAGES,zabbix-agent)
+	@$(call add,DEFAULT_SERVICES_ENABLE,zabbix_agentd)
+
 distro/icewm-efi: distro/icewm use/efi/debug use/firmware
 	@$(call add,INSTALL2_PACKAGES,strace)

@@ -44,6 +49,8 @@ distro/desktop-systemd: distro/icewm +systemd; @:
 distro/desktop-plymouth: distro/icewm +plymouth; @:
 distro/server-efi: distro/server-mini use/efi/debug; @:

+distro/server-zabbix: distro/server-mini use/server/zabbix use/net-eth
+
 endif # IMAGE_CLASS: distro

 ifeq (ve,$(IMAGE_CLASS))