From owner-svn-ports-head@FreeBSD.ORG Sat Dec 27 14:52:38 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E694A10C; Sat, 27 Dec 2014 14:52:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D255BB4F; Sat, 27 Dec 2014 14:52:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBREqboh026489; Sat, 27 Dec 2014 14:52:37 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBREqank026485; Sat, 27 Dec 2014 14:52:36 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201412271452.sBREqank026485@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 27 Dec 2014 14:52:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375683 - in head/net-mgmt: zabbix22-server/files zabbix24-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Dec 2014 14:52:38 -0000 Author: pi Date: Sat Dec 27 14:52:35 2014 New Revision: 375683 URL: https://svnweb.freebsd.org/changeset/ports/375683 QAT: https://qat.redports.org/buildarchive/r375683/ Log: net-mgmt/zabbix2[24]-server: fix zabbix and database startup sequence The Zabbix server and proxy ports require a database to run. They currently support four, PostgreSQL, Oracle, SQLite, and MySQL. As of now, rcorder puts them ahead of the database ports, so they spit out dozens of error messages during startup and, worse, get the database pulled out from under them during shutdown. The ports used to provide a solution for this, by defining ZABBIX_REQUIRE. The value of this variable used to be added to the REQUIRE lines in the startup scripts, but this was removed accidentally from 2.2 in r355546 and never existed in 2.4. This patch adds it back, in a slightly different, optionsng-friendly way. PR: 195081 Submitted by: chris@chrullrich.net Approved by: pakhom706@gmail.com (maintainer) Modified: head/net-mgmt/zabbix22-server/files/zabbix_proxy.in head/net-mgmt/zabbix22-server/files/zabbix_server.in head/net-mgmt/zabbix24-server/files/zabbix_proxy.in head/net-mgmt/zabbix24-server/files/zabbix_server.in Modified: head/net-mgmt/zabbix22-server/files/zabbix_proxy.in ============================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sat Dec 27 13:10:40 2014 (r375682) +++ head/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sat Dec 27 14:52:35 2014 (r375683) @@ -1,7 +1,9 @@ #!/bin/sh # PROVIDE: zabbix_proxy -# REQUIRE: DAEMON%%ZABBIX_REQUIRE%% +# REQUIRE: DAEMON +%%PGSQL%%# REQUIRE: postgresql +%%MYSQL%%# REQUIRE: mysql-server # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to Modified: head/net-mgmt/zabbix22-server/files/zabbix_server.in ============================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_server.in Sat Dec 27 13:10:40 2014 (r375682) +++ head/net-mgmt/zabbix22-server/files/zabbix_server.in Sat Dec 27 14:52:35 2014 (r375683) @@ -1,7 +1,9 @@ #!/bin/sh # PROVIDE: zabbix_server -# REQUIRE: DAEMON%%ZABBIX_REQUIRE%% +# REQUIRE: DAEMON +%%PGSQL%%# REQUIRE: postgresql +%%MYSQL%%# REQUIRE: mysql-server # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to Modified: head/net-mgmt/zabbix24-server/files/zabbix_proxy.in ============================================================================== --- head/net-mgmt/zabbix24-server/files/zabbix_proxy.in Sat Dec 27 13:10:40 2014 (r375682) +++ head/net-mgmt/zabbix24-server/files/zabbix_proxy.in Sat Dec 27 14:52:35 2014 (r375683) @@ -1,7 +1,9 @@ #!/bin/sh # PROVIDE: zabbix_proxy -# REQUIRE: DAEMON%%ZABBIX_REQUIRE%% +# REQUIRE: DAEMON +%%PGSQL%%# REQUIRE: postgresql +%%MYSQL%%# REQUIRE: mysql-server # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to Modified: head/net-mgmt/zabbix24-server/files/zabbix_server.in ============================================================================== --- head/net-mgmt/zabbix24-server/files/zabbix_server.in Sat Dec 27 13:10:40 2014 (r375682) +++ head/net-mgmt/zabbix24-server/files/zabbix_server.in Sat Dec 27 14:52:35 2014 (r375683) @@ -1,7 +1,9 @@ #!/bin/sh # PROVIDE: zabbix_server -# REQUIRE: DAEMON%%ZABBIX_REQUIRE%% +# REQUIRE: DAEMON +%%PGSQL%%# REQUIRE: postgresql +%%MYSQL%%# REQUIRE: mysql-server # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to