From 078a71d3d0202289f25873fd2bbae9f0960400e0 Mon Sep 17 00:00:00 2001 From: Jonathan Pagel Date: Sun, 31 Oct 2021 17:43:25 +0100 Subject: [PATCH] telegraf: Move config file to /etc/telegraf.conf because /etc/config is the default uci folder. Also marking it as configuration file prevents overwriting it on updates. Signed-off-by: Jonathan Pagel --- utils/telegraf/Makefile | 8 +++++++- utils/telegraf/files/etc/init.d/telegraf | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/utils/telegraf/Makefile b/utils/telegraf/Makefile index b0c224946..53a81ec5e 100644 --- a/utils/telegraf/Makefile +++ b/utils/telegraf/Makefile @@ -59,6 +59,12 @@ define Package/telegraf-full/description (Full build. including all plugins) endef +define Package/telegraf/conffiles +/etc/telegraf.conf +endef + +Package/telegraf-full/conffiles = $(Package/telegraf/conffiles) + define Build/Prepare $(call Build/Prepare/Default) ifeq ($(BUILD_VARIANT),small) @@ -70,7 +76,7 @@ define Package/telegraf/install $(call GoPackage/Package/Install/Bin,$(1)) $(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config $(INSTALL_BIN) ./files/etc/init.d/telegraf $(1)/etc/init.d/telegraf - $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/telegraf.conf $(1)/etc/config/telegraf.conf + $(INSTALL_CONF) $(PKG_BUILD_DIR)/etc/telegraf.conf $(1)/etc/telegraf.conf endef define Package/telegraf-full/install diff --git a/utils/telegraf/files/etc/init.d/telegraf b/utils/telegraf/files/etc/init.d/telegraf index 9faef6611..dd1c8a1f5 100755 --- a/utils/telegraf/files/etc/init.d/telegraf +++ b/utils/telegraf/files/etc/init.d/telegraf @@ -7,7 +7,7 @@ STOP=01 start_service() { procd_open_instance - procd_set_param command /usr/bin/telegraf --config /etc/config/telegraf.conf + procd_set_param command /usr/bin/telegraf --config /etc/telegraf.conf procd_set_param stdout 1 procd_set_param stderr 1 procd_close_instance