mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

logmngr: miscellaneous fixes

Browse source 
Always migrate configuration. Do not set executable bit on config
files and uci-defaults scripts. Remove unused /lib/functions.sh
include. Remove redundant "default y" on choice.
This commit is contained in:
Erik Karlsson 2025-08-18 11:34:33 +02:00
parent d468c13b3f
commit 2503b1fc72
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
logmngr/Config.in
View file

@ -1,4 +1,5 @@
if PACKAGE_logmngr if PACKAGE_logmngr
choice choice
prompt "Select backend for syslog management" prompt "Select backend for syslog management"
default LOGMNGR_BACKEND_FLUENTBIT default LOGMNGR_BACKEND_FLUENTBIT
@ -8,7 +9,6 @@ choice
config LOGMNGR_BACKEND_FLUENTBIT config LOGMNGR_BACKEND_FLUENTBIT
bool "Use fluent-bit for log management" bool "Use fluent-bit for log management"
default y
help help
Enable this option to use fluent-bit for log management. Enable this option to use fluent-bit for log management.

11
logmngr/Makefile
View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=logmngr PKG_NAME:=logmngr
PKG_VERSION:=1.1.0 PKG_VERSION:=1.1.1
LOCAL_DEV:=0 LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1) ifneq ($(LOCAL_DEV),1)
@ -55,8 +55,9 @@ define Package/logmngr/install
$(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/etc/init.d/logmngr $(1)/etc/init.d/logmngr $(INSTALL_BIN) ./files/etc/init.d/logmngr $(1)/etc/init.d/
$(INSTALL_BIN) ./files/etc/config/logmngr $(1)/etc/config/logmngr $(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 $(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 $(INSTALL_DIR) $(1)/lib/logmngr
ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y) ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y)
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) ./files/logread $(1)/sbin/ $(INSTALL_BIN) ./files/logread $(1)/sbin/
$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/ $(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) else ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/ $(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/
endif endif
ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y) ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y)
$(INSTALL_DATA) ./files/lib/logmngr/logrotate.sh $(1)/lib/logmngr/ $(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 $(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbflogrotate.so $(1) sysmngr 11
endif endif

3
logmngr/files/etc/uci-defaults/10-logmngr_config_migrate
View file

@ -1,7 +1,5 @@
#!/bin/sh #!/bin/sh
. /lib/functions.sh
# check if this is a new type UCI or old type UCI # check if this is a new type UCI or old type UCI
if ! uci -q get logmngr.default_source > /dev/null; then if ! uci -q get logmngr.default_source > /dev/null; then
uci -q set logmngr.default_source=source 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' uci -q set logmngr.default_source.kernel_messages='1'
fi fi
if ! uci -q get logmngr.default_template > /dev/null; then if ! uci -q get logmngr.default_template > /dev/null; then
uci -q set logmngr.default_template=template uci -q set logmngr.default_template=template
uci -q set logmngr.default_template.name='default_template' uci -q set logmngr.default_template.name='default_template'