aboutsummaryrefslogtreecommitdiff
path: root/admin/zabbix/Makefile
diff options
context:
space:
mode:
authorEtienne Champetier <champetier.etienne@gmail.com>2018-10-23 19:20:50 -0400
committerEtienne Champetier <champetier.etienne@gmail.com>2018-10-23 19:26:38 -0400
commit5d1aa99648bc2e22d7db7cc12926ea79e130bb04 (patch)
tree88a7a60c8d5a7c4c77746cc0c21804f6d3885fec /admin/zabbix/Makefile
parent2df5d52b9e2cd38876e4d3e70706d484d87ab3f5 (diff)
zabbix: use ubus for zabbix-extra-network
this allow us to stop using uci /var/state, which is deprecated since forever Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
Diffstat (limited to 'admin/zabbix/Makefile')
-rw-r--r--admin/zabbix/Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 9c7102d99..6710e4c21 100644
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix
PKG_VERSION:=3.4.14
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=7443873cc970672d3c884230d3aeb082f2d8afcc2b757506c2d684ffdd12d77e
@@ -74,7 +74,7 @@ endef
define Package/zabbix-extra-network
$(call Package/zabbix/Default)
TITLE+= discovery/userparameters for network
- DEPENDS = +zabbix-agentd +libuci-lua +lua
+ DEPENDS = +zabbix-agentd +libubus-lua +lua
endef
define Package/zabbix-extra-wifi
@@ -229,6 +229,15 @@ endef
define Package/zabbix-extra-network/install
$(call Package/zabbix/install/zabbix.conf.d,$(1),network)
+ $(INSTALL_DIR) $(1)/usr/share/acl.d
+ $(INSTALL_DATA) ./files/zabbix-network-ubus-acl.json $(1)/usr/share/acl.d/zabbix-network.json
+endef
+
+define Package/zabbix-extra-network/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+ killall -HUP ubusd
+fi
endef
define Package/zabbix-extra-wifi/install