Changeset 40638


Ignore:
Timestamp:
2014-05-01T20:31:12+02:00 (4 years ago)
Author:
hauke
Message:

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

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/admin/zabbix/Makefile

    r39489 r40638  
    1010PKG_NAME:=zabbix 
    1111PKG_VERSION:=2.2.1 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    147147define Package/zabbix/install/zabbix.conf.d 
    148148        $(INSTALL_DIR) \ 
    149                 $(1)/etc/zabbix_$(2).conf.d 
    150  
    151         $(INSTALL_BIN) \ 
    152                 ./files/$(3) \ 
    153                 $(1)/etc/zabbix_$(2).conf.d/$(3) 
     149                $(1)/etc/zabbix_agentd.conf.d 
     150 
     151        $(INSTALL_BIN) \ 
     152                ./files/$(2) \ 
     153                $(1)/etc/zabbix_agentd.conf.d/$(2) 
    154154endef 
    155155 
     
    194194 
    195195define Package/zabbix-agentd/install 
     196        $(INSTALL_DIR) $(1)/etc/zabbix_agentd.conf.d 
    196197        $(call Package/zabbix/install/sbin,$(1),agentd) 
    197198        $(call Package/zabbix/install/etc,$(1),agentd) 
     
    200201 
    201202define Package/zabbix-extra-mac80211/install 
    202         $(call Package/zabbix/install/zabbix.conf.d,$(1),agentd,mac80211) 
     203        $(call Package/zabbix/install/zabbix.conf.d,$(1),mac80211) 
    203204        $(INSTALL_DIR) $(1)/usr/bin 
    204205        $(INSTALL_BIN) $(PKG_BUILD_DIR)/zabbix-extra-mac80211/zabbix_helper_mac80211 $(1)/usr/bin/ 
     
    207208 
    208209define Package/zabbix-extra-network/install 
    209         $(call Package/zabbix/install/zabbix.conf.d,$(1),agentd,network) 
     210        $(call Package/zabbix/install/zabbix.conf.d,$(1),network) 
    210211endef 
    211212 
    212213define Package/zabbix-extra-wifi/install 
    213         $(call Package/zabbix/install/zabbix.conf.d,$(1),agentd,wifi) 
     214        $(call Package/zabbix/install/zabbix.conf.d,$(1),wifi) 
    214215endef 
    215216 
Note: See TracChangeset for help on using the changeset viewer.