From: Daniel F. Dickinson <redacted>
Date: Fri, 17 Jul 2026 01:09:43 +0000 (-0400)
Subject: zabbix: preserve user config files across sysupgrade
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=9058162e11dc2e0728aaa3380d975e4f412168b3;p=openwrt-packages.git

zabbix: preserve user config files across sysupgrade

Add the user config file directories (/etc/zabbix_x.conf.d) to the
list of directories and files to preserve across sysupgrade.

Signed-off-by: Daniel F. Dickinson <redacted>
---

diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index f56934376..4c875d2f5 100644
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -492,6 +492,7 @@ endef
 
 define Package/zabbix-agentd/conffiles
 /etc/zabbix_agentd.conf
+/etc/zabbix_agentd.conf.d/
 endef
 
 define Package/zabbix-agentd/install
@@ -503,6 +504,7 @@ endef
 
 define Package/zabbix-agentd-basic/conffiles
 /etc/zabbix_agentd.conf
+/etc/zabbix_agentd.conf.d/
 endef
 
 define Package/zabbix-agentd-basic/install
@@ -514,6 +516,7 @@ endef
 
 define Package/zabbix-proxy/conffiles
 /etc/zabbix_proxy.conf
+/etc/zabbix_proxy.conf.d/
 endef
 
 define Package/zabbix-proxy/install
@@ -524,6 +527,7 @@ endef
 
 define Package/zabbix-proxy-basic-sqlite/conffiles
 /etc/zabbix_proxy.conf
+/etc/zabbix_proxy.conf.d/
 endef
 
 define Package/zabbix-proxy-basic-sqlite/install
@@ -534,6 +538,7 @@ endef
 
 define Package/zabbix-server/conffiles
 /etc/zabbix_server.conf
+/etc/zabbix_server.conf.d/
 /etc/config/zabbix_server
 /etc/sysctl.d/90-zabbix-discovery-workers.conf
 endef