bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zabbix: Always install /etc/zabbix_agentd.conf.d dir for zabbix-agentd

Browse Source 
I patched the conf file to use this dir (so zabbix-extra-* work right away),
but it is not created unless we select a zabbix-extra-*,
thus preventing default conf from working
Reported by Jiri Slachta in his patch "zabbix: update to 2.2.0"

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@40638 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2014-05-01 18:31:12 +00:00
parent 6f1d45e5a4
commit db78659473
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/zabbix/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix
PKG_VERSION:=2.2.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/zabbix
@ -146,11 +146,11 @@ endef
define Package/zabbix/install/zabbix.conf.d
$(INSTALL_DIR) \
$(1)/etc/zabbix_$(2).conf.d
$(1)/etc/zabbix_agentd.conf.d
$(INSTALL_BIN) \
./files/$(3) \
$(1)/etc/zabbix_$(2).conf.d/$(3)
./files/$(2) \
$(1)/etc/zabbix_agentd.conf.d/$(2)
endef
define Package/zabbix-agent/conffiles
@ -193,24 +193,25 @@ define Package/zabbix-agent/install
endef
define Package/zabbix-agentd/install
$(INSTALL_DIR) $(1)/etc/zabbix_agentd.conf.d
$(call Package/zabbix/install/sbin,$(1),agentd)
$(call Package/zabbix/install/etc,$(1),agentd)
$(call Package/zabbix/install/init.d,$(1),agentd)
endef
define Package/zabbix-extra-mac80211/install
$(call Package/zabbix/install/zabbix.conf.d,$(1),agentd,mac80211)
$(call Package/zabbix/install/zabbix.conf.d,$(1),mac80211)
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/zabbix-extra-mac80211/zabbix_helper_mac80211 $(1)/usr/bin/
chmod 4755 $(1)/usr/bin/zabbix_helper_mac80211
endef
define Package/zabbix-extra-network/install
$(call Package/zabbix/install/zabbix.conf.d,$(1),agentd,network)
$(call Package/zabbix/install/zabbix.conf.d,$(1),network)
endef
define Package/zabbix-extra-wifi/install
$(call Package/zabbix/install/zabbix.conf.d,$(1),agentd,wifi)
$(call Package/zabbix/install/zabbix.conf.d,$(1),wifi)
endef
define Package/zabbix-sender/install