Date: Sat, 27 Dec 2014 14:52:36 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> 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 Message-ID: <201412271452.sBREqank026485@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412271452.sBREqank026485>