Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Apr 2024 14:03:49 GMT
From:      Juraj Lutter <otis@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9d83b1839c8f - main - net-mgmt/zabbix64-server: Make service depend on mysql service
Message-ID:  <202404291403.43TE3nGR028944@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9d83b1839c8ffae135c4094e3a49a26cd133c874

commit 9d83b1839c8ffae135c4094e3a49a26cd133c874
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2024-04-29 13:55:53 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2024-04-29 14:03:37 +0000

    net-mgmt/zabbix64-server: Make service depend on mysql service
    
    When using zabbix64-server with MariaDB, rc.d/zabbix_server does not
    contain "REQUIRE: mysql".  Therefore, when shutting down the host, mysql
    stops before zabbix_server and prevents zabbix_server from stopping.
    
    Fix this also for MYSQLDV option and also for zabbix64-proxy in
    addition to zabbix64-server.
    
    PR:             278629
---
 net-mgmt/zabbix64-server/Makefile               | 2 +-
 net-mgmt/zabbix64-server/files/zabbix_proxy.in  | 3 +++
 net-mgmt/zabbix64-server/files/zabbix_server.in | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/net-mgmt/zabbix64-server/Makefile b/net-mgmt/zabbix64-server/Makefile
index 842d059282bb..ac94ca0b06ce 100644
--- a/net-mgmt/zabbix64-server/Makefile
+++ b/net-mgmt/zabbix64-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	zabbix64
 DISTVERSION=	6.4.14
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/
 PKGNAMESUFFIX?=	-server
diff --git a/net-mgmt/zabbix64-server/files/zabbix_proxy.in b/net-mgmt/zabbix64-server/files/zabbix_proxy.in
index 274c75c29251..0ce9f01f549f 100644
--- a/net-mgmt/zabbix64-server/files/zabbix_proxy.in
+++ b/net-mgmt/zabbix64-server/files/zabbix_proxy.in
@@ -4,6 +4,9 @@
 # REQUIRE: DAEMON
 %%PGSQL%%# REQUIRE: postgresql
 %%MYSQL%%# REQUIRE: mysql
+%%MYSQLDV%%# REQUIRE: mysql
+%%MDB5%%# REQUIRE: mysql
+%%MDB6%%# REQUIRE: mysql
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-mgmt/zabbix64-server/files/zabbix_server.in b/net-mgmt/zabbix64-server/files/zabbix_server.in
index 68e9f052734e..8a1fa48a890c 100644
--- a/net-mgmt/zabbix64-server/files/zabbix_server.in
+++ b/net-mgmt/zabbix64-server/files/zabbix_server.in
@@ -4,6 +4,9 @@
 # REQUIRE: DAEMON
 %%PGSQL%%# REQUIRE: postgresql
 %%MYSQL%%# REQUIRE: mysql
+%%MYSQLDV%%# REQUIRE: mysql
+%%MDB5%%# REQUIRE: mysql
+%%MDB6%%# REQUIRE: mysql
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404291403.43TE3nGR028944>