diff --git a/logmngr/Config.in b/logmngr/Config.in index b598a78d4..57f8410a6 100644 --- a/logmngr/Config.in +++ b/logmngr/Config.in @@ -1,4 +1,5 @@ if PACKAGE_logmngr + choice prompt "Select backend for syslog management" default LOGMNGR_BACKEND_FLUENTBIT @@ -8,7 +9,6 @@ choice config LOGMNGR_BACKEND_FLUENTBIT bool "Use fluent-bit for log management" - default y help Enable this option to use fluent-bit for log management. diff --git a/logmngr/Makefile b/logmngr/Makefile index d1e1a4bfc..3315e94fa 100644 --- a/logmngr/Makefile +++ b/logmngr/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=logmngr -PKG_VERSION:=1.1.0 +PKG_VERSION:=1.1.1 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) @@ -55,8 +55,9 @@ define Package/logmngr/install $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/etc/init.d/logmngr $(1)/etc/init.d/logmngr - $(INSTALL_BIN) ./files/etc/config/logmngr $(1)/etc/config/logmngr + $(INSTALL_BIN) ./files/etc/init.d/logmngr $(1)/etc/init.d/ + $(INSTALL_DATA) ./files/etc/config/logmngr $(1)/etc/config/ + $(INSTALL_DATA) ./files/etc/uci-defaults/10-logmngr_config_migrate $(1)/etc/uci-defaults/ $(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1) core 10 @@ -64,17 +65,15 @@ define Package/logmngr/install $(INSTALL_DIR) $(1)/lib/logmngr ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y) $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) ./files/logread $(1)/sbin/ $(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/ - $(INSTALL_BIN) ./files/etc/uci-defaults/10-logmngr_config_migrate $(1)/etc/uci-defaults/ else ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y) $(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/ endif ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y) $(INSTALL_DATA) ./files/lib/logmngr/logrotate.sh $(1)/lib/logmngr/ - $(INSTALL_BIN) .//files/etc/uci-defaults/11-logmngr_logrotate_syslog $(1)/etc/uci-defaults/ + $(INSTALL_DATA) ./files/etc/uci-defaults/11-logmngr_logrotate_syslog $(1)/etc/uci-defaults/ $(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbflogrotate.so $(1) sysmngr 11 endif diff --git a/logmngr/files/etc/uci-defaults/10-logmngr_config_migrate b/logmngr/files/etc/uci-defaults/10-logmngr_config_migrate index 50359a8c1..6e698bd08 100644 --- a/logmngr/files/etc/uci-defaults/10-logmngr_config_migrate +++ b/logmngr/files/etc/uci-defaults/10-logmngr_config_migrate @@ -1,7 +1,5 @@ #!/bin/sh -. /lib/functions.sh - # check if this is a new type UCI or old type UCI if ! uci -q get logmngr.default_source > /dev/null; then uci -q set logmngr.default_source=source @@ -10,7 +8,6 @@ if ! uci -q get logmngr.default_source > /dev/null; then uci -q set logmngr.default_source.kernel_messages='1' fi - if ! uci -q get logmngr.default_template > /dev/null; then uci -q set logmngr.default_template=template uci -q set logmngr.default_template.name='default_template'