From nobody Mon Apr 29 14:03:50 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSlRp67xdz5JP9N; Mon, 29 Apr 2024 14:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSlRp4ftWz4DNM; Mon, 29 Apr 2024 14:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714399430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oqz4fv+iTYmnOfzhNfd4Bs4KrsjZCIX8porg+JM5cUI=; b=oSQtq9KI3CO/B10vg5TeQ74aPf1Hv0VN4SsR5XSN+tHanojwEXa6ZR7BgME1mYVAHKqHAt FIS1navbTLVrK6HoMK+tHWvESl0P48ZYuN2hCkx8WM/fVRUf1AWHgYnDVX5XojAQ8B3uHd TosTuKB9RN15cd+W/7bQ26ZlRPkbWXXkaGpBBxj3llRUyOucZYFhcu+d9tey9UVvuMSY3X BtdSYYfLnyHely86Fnz3hn1+K6Qn5pLdd2zOFwAjXxtlMkj28gjqDme8HXfWWM86bewge2 cDA/rsOj+2PSRXl4TqiPoyMzVs0oU1w4SoxA2/ZtI2CWKym/YZJc2qMKKvVb1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714399430; a=rsa-sha256; cv=none; b=iitXX7J88OHJe5M/6ccGe9filSgSvsiHw7xvf3p8bZVp8j04DwnnrsbVvEpZPdk1xSMjRb F7pt584p0Lc7Mzew09OGrUXbK9iKDI/Xp+doMDZxwAmftYgu4a8u/u6v7gCzAZdjPkSZ7r YGU9eRz1AHkewyfZAbic8uYRzIAT4ORb4MeHp6dHCimNESlV9Z85jHtX1kzj32g1yQLEc7 rZiTEZUkBZYlD61Tz4I+CC0wAenYeQuo725D0HLkWVLQJFrIl+uFLRVR78dD+1SS5Q6E4d U/odpMURUtaiZSi7Td4nkWsLFmcNb6sduS6aXLdZQtxIiWSoMoIZbO8QsObjAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714399430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oqz4fv+iTYmnOfzhNfd4Bs4KrsjZCIX8porg+JM5cUI=; b=Xe8WbHBzLPST8sQDyyk5SY+c5q9CsDoPehabM7b5cA/YDKgIKQOroaDFXEDnO68+gsMA88 E9YrDTnf/2x62amjKDwPDGrjJS6iW9UuMTiZVvTXKuY5tN0qv31VY+n9jhsbluRO1oIWxa Q/XFY84we2CtYM2SzoHq4ndiBJs5fWN/xBWIm+qoli4JKSrsyEQyV+m+P4YExhW0q8jFRu yfPyIkPLC9psUlFR9MOowYtD6I69JR/gKTrCkN+kBP+SCPQf9jtEVdi6XrYl3fJGGGjEbG 7nj6eJRBnh+QyI1gJHqfdi5Z//JDxnY/wZYRxsb69WRCgKGYrXh04+it5IIGFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSlRp4GsWz1BLc; Mon, 29 Apr 2024 14:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43TE3oKh028995; Mon, 29 Apr 2024 14:03:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TE3oPg028992; Mon, 29 Apr 2024 14:03:50 GMT (envelope-from git) Date: Mon, 29 Apr 2024 14:03:50 GMT Message-Id: <202404291403.43TE3oPg028992@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: df6ff2da571f - main - net-mgmt/zabbix6-server: Make service depend on mysql service List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df6ff2da571f4661591a83ba364c0d94bd3146af Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=df6ff2da571f4661591a83ba364c0d94bd3146af commit df6ff2da571f4661591a83ba364c0d94bd3146af Author: Juraj Lutter AuthorDate: 2024-04-29 14:00:21 +0000 Commit: Juraj Lutter CommitDate: 2024-04-29 14:03:37 +0000 net-mgmt/zabbix6-server: Make service depend on mysql service When using zabbix6-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 zabbix6-proxy in addition to zabbix6-server. PR: 278629 --- net-mgmt/zabbix6-server/files/zabbix_proxy.in | 3 +++ net-mgmt/zabbix6-server/files/zabbix_server.in | 3 +++ 2 files changed, 6 insertions(+) diff --git a/net-mgmt/zabbix6-server/files/zabbix_proxy.in b/net-mgmt/zabbix6-server/files/zabbix_proxy.in index 274c75c29251..0ce9f01f549f 100644 --- a/net-mgmt/zabbix6-server/files/zabbix_proxy.in +++ b/net-mgmt/zabbix6-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/zabbix6-server/files/zabbix_server.in b/net-mgmt/zabbix6-server/files/zabbix_server.in index 68e9f052734e..8a1fa48a890c 100644 --- a/net-mgmt/zabbix6-server/files/zabbix_server.in +++ b/net-mgmt/zabbix6-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