diff --git a/ddnsmngr/Makefile b/ddnsmngr/Makefile index c52657c55..cc3a97ad3 100644 --- a/ddnsmngr/Makefile +++ b/ddnsmngr/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddnsmngr -PKG_VERSION:=1.0.2 +PKG_VERSION:=1.0.3 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) @@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_CONFIG_DEPENDS:=CONFIG_DDNSMNGR_BACKEND_DDNSSCRIPT CONFIG_DDNSMNGR_BACKEND_INADYN include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk define Package/$(PKG_NAME) SECTION:=utils @@ -57,11 +58,10 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DIR) $(1)/usr/libexec/rpcd - $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1)/etc/ddnsmngr/ - $(INSTALL_DATA) ./files/etc/ddnsmngr/input.json $(1)/etc/ddnsmngr/ + $(call BbfdmInstallPluginInMicroservice,$(1)/etc/ddnsmngr,$(PKG_BUILD_DIR)/src/libddnsmngr.so) + $(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/ddnsmngr/input.json) $(INSTALL_DATA) ./files/etc/config/ddnsmngr $(1)/etc/config/ddnsmngr $(INSTALL_BIN) ./files/etc/uci-defaults/01-ddns-config-migrate $(1)/etc/uci-defaults/ - $(INSTALL_BIN) ./files/etc/uci-defaults/50_add_ddnsmngr_dm_microservice $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/etc/init.d/ddnsmngr $(1)/etc/init.d/ddnsmngr ifeq ($(CONFIG_DDNSMNGR_BACKEND_DDNSSCRIPT),y) $(INSTALL_BIN) ./files/usr/lib/ddns_script/ddnsmngr_service.sh $(1)/usr/lib/ddnsmngr/ diff --git a/ddnsmngr/files/etc/ddnsmngr/input.json b/ddnsmngr/files/etc/ddnsmngr/input.json index 91580ecfe..2da4687b2 100644 --- a/ddnsmngr/files/etc/ddnsmngr/input.json +++ b/ddnsmngr/files/etc/ddnsmngr/input.json @@ -1,12 +1,14 @@ { "daemon": { + "config": { + "loglevel": "1" + }, "input": { "type": "DotSo", "name": "/etc/ddnsmngr/libddnsmngr.so" }, "output": { "type": "UBUS", - "name": "bbfdm.ddnsmngr", "parent_dm": "Device.", "object": "DynamicDNS", "root_obj": "bbfdm" diff --git a/ddnsmngr/files/etc/uci-defaults/50_add_ddnsmngr_dm_microservice b/ddnsmngr/files/etc/uci-defaults/50_add_ddnsmngr_dm_microservice deleted file mode 100644 index 3d634328e..000000000 --- a/ddnsmngr/files/etc/uci-defaults/50_add_ddnsmngr_dm_microservice +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if ! uci -q get bbfdm.ddnsmngr > /dev/null; then - uci set bbfdm.ddnsmngr=micro_service - uci set bbfdm.ddnsmngr.enable=1 - uci set bbfdm.ddnsmngr.input_json="/etc/ddnsmngr/input.json" - uci set bbfdm.ddnsmngr.loglevel=1 -fi