From 07bce501d390e0ef0fc5c037ce29a085a5410694 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 18 Nov 2021 23:31:46 +0100 Subject: [PATCH 1/3] net-mgmt/zabbix-proxy: use new db file for each version, fixes #1943 --- net-mgmt/zabbix-proxy/pkg-descr | 4 ++++ .../templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/net-mgmt/zabbix-proxy/pkg-descr b/net-mgmt/zabbix-proxy/pkg-descr index fdffbe0b9..3c969a50e 100644 --- a/net-mgmt/zabbix-proxy/pkg-descr +++ b/net-mgmt/zabbix-proxy/pkg-descr @@ -12,6 +12,10 @@ WWW: https://www.zabbix.com/ Plugin Changelog ---------------- +1.6 + +* Fix upgrade path by using a new db file for each version (#1943) + 1.5 * Add log file to web GUI (contributed by Starkstromkonsument) diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in index d3b5ec258..f4b2adf11 100644 --- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in +++ b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in @@ -22,7 +22,7 @@ SourceIP={{ OPNsense.zabbixproxy.general.sourceip }} {% endif %} LogFile=/var/log/zabbix/zabbix_proxy.log PidFile=/var/run/zabbix/zabbix_proxy.pid -DBName=/var/db/zabbix/zabbix_proxy.db +DBName=/var/db/zabbix/%%PLUGIN_VARIANT%%_proxy.db {% if helpers.exists('OPNsense.zabbixproxy.general.proxyofflinebuffer') and OPNsense.zabbixproxy.general.proxyofflinebuffer != '' %} ProxyOfflineBuffer={{ OPNsense.zabbixproxy.general.proxyofflinebuffer }} {% endif %} From d155732db6c8508070e55df72445dcc71686e53f Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 18 Nov 2021 23:34:57 +0100 Subject: [PATCH 2/3] net-mgmt/zabbix-proxy: add plugin variant for version 5.4 --- net-mgmt/zabbix-proxy/Makefile | 5 ++++- net-mgmt/zabbix-proxy/pkg-descr | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/net-mgmt/zabbix-proxy/Makefile b/net-mgmt/zabbix-proxy/Makefile index ec72c7e56..2b2151993 100644 --- a/net-mgmt/zabbix-proxy/Makefile +++ b/net-mgmt/zabbix-proxy/Makefile @@ -2,11 +2,14 @@ PLUGIN_NAME= zabbix-proxy PLUGIN_VERSION= 1.5 PLUGIN_COMMENT= Zabbix monitoring proxy PLUGIN_MAINTAINER= m.muenz@gmail.com -PLUGIN_VARIANTS= zabbix5 zabbix4 +PLUGIN_VARIANTS= zabbix5 zabbix54 zabbix4 zabbix5_NAME= zabbix5-proxy zabbix5_DEPENDS= zabbix5-proxy +zabbix54_NAME= zabbix54-proxy +zabbix54_DEPENDS= zabbix54-proxy + zabbix4_NAME= zabbix4-proxy zabbix4_DEPENDS= zabbix4-proxy diff --git a/net-mgmt/zabbix-proxy/pkg-descr b/net-mgmt/zabbix-proxy/pkg-descr index 3c969a50e..9a405114b 100644 --- a/net-mgmt/zabbix-proxy/pkg-descr +++ b/net-mgmt/zabbix-proxy/pkg-descr @@ -15,6 +15,7 @@ Plugin Changelog 1.6 * Fix upgrade path by using a new db file for each version (#1943) +* Add plugin variant for Zabbix Proxy 5.4 1.5 From d30672897b67ecfe5841efdd4fd2a8b4427de50f Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 18 Nov 2021 23:36:09 +0100 Subject: [PATCH 3/3] net-mgmt/zabbix-proxy: bump version --- net-mgmt/zabbix-proxy/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-mgmt/zabbix-proxy/Makefile b/net-mgmt/zabbix-proxy/Makefile index 2b2151993..362f05058 100644 --- a/net-mgmt/zabbix-proxy/Makefile +++ b/net-mgmt/zabbix-proxy/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= zabbix-proxy -PLUGIN_VERSION= 1.5 +PLUGIN_VERSION= 1.6 PLUGIN_COMMENT= Zabbix monitoring proxy PLUGIN_MAINTAINER= m.muenz@gmail.com PLUGIN_VARIANTS= zabbix5 zabbix54 zabbix4