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 <jonny_tischbein@systemli.org>
(cherry picked from commit abb33331e532b1de40adea6553589770b3e9ddb9)
Signed-off-by: Jonathan Pagel <jonny_tischbein@systemli.org>

diff --git a/utils/telegraf/Makefile b/utils/telegraf/Makefile
index 3bb9f1d2613846649a4a7d87cf8a13c80ec10230..e444d69f86e1e991693a019a744ae057883388c4 100644 (file)
--- 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 9faef6611efcfe6e50cbf08683c5ee53e05c3b08..dd1c8a1f5e281a8d0858b2348e66967fe6b68732 100755 (executable)
--- 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