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 @@ -1,68 +1,71 @@ #!/bin/sh # PROVIDE: zabbix_proxy # 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 # enable zabbix_proxy: # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. # zabbix_proxy_config (string): Set to the standard config file path by # default. # zabbix_proxy_pidfile (string): Location of the zabbix_proxy pid file # Default is /var/run/zabbix/zabbix_proxy.pid # zabbix_proxy_paths (string): Set to standard path by default. Set a search # if you have custom userparams that need binaries elsewhere. # . /etc/rc.subr name="zabbix_proxy" rcvar=zabbix_proxy_enable load_rc_config $name : ${zabbix_proxy_enable:=NO} : ${zabbix_proxy_config:=%%ETCDIR%%/${name}.conf} : ${zabbix_proxy_pidfile:=/var/run/zabbix/zabbix_proxy.pid} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_proxy_config}" start_cmd=zabbix_proxy_cmd start_precmd=zabbix_proxy_precmd status_precmd=zabbix_proxy_precmd stop_precmd=zabbix_proxy_precmd zabbix_proxy_precmd() { pidfile=${zabbix_proxy_pidfile} if get_pidfile_from_conf PidFile ${zabbix_proxy_config}; then pidfile="$_pidfile_from_conf" fi logfile=/var/log/zabbix/zabbix_proxy.log if get_pidfile_from_conf LogFile ${zabbix_proxy_config}; then logfile="$_pidfile_from_conf" fi local rundir=${pidfile%/*} local logdir=${logfile%/*} [ -d $rundir ] || install -d -m 0755 -o zabbix -g zabbix $rundir [ -d $logdir ] || install -d -m 0755 -o zabbix -g zabbix $logdir # This shouldn't be necessary with pidfile, but empirically it was the # only way to reap the parent PID instead of all PIDs from # check_process, which may leak SysV IPC objects and prevent restart # and/or race condition on restart. rc_pid=$(check_pidfile ${pidfile} ${command}) } zabbix_proxy_cmd() { PATH=$zabbix_proxy_paths $command -c $zabbix_proxy_config } run_rc_command "$1" 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 @@ -1,69 +1,72 @@ #!/bin/sh # PROVIDE: zabbix_server # 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 # enable zabbix_server: # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. # zabbix_server_config (string): Set to the standard config file path by # default. # zabbix_server_pidfile (string): Location of the zabbix_server pid file # Default is /var/run/zabbix/zabbix_server.pid # zabbix_server_paths (string): Set to standard path by default. Set a search # if you have custom userparams that need binaries elsewhere. # . /etc/rc.subr name="zabbix_server" rcvar=zabbix_server_enable load_rc_config $name : ${zabbix_server_enable:=NO} : ${zabbix_server_config:=%%ETCDIR%%/${name}.conf} : ${zabbix_server_pidfile:=/var/run/zabbix/zabbix_server.pid} : ${zabbix_server_paths:=$PATH} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_server_config}" start_cmd=zabbix_server_cmd start_precmd=zabbix_server_precmd status_precmd=zabbix_server_precmd stop_precmd=zabbix_server_precmd zabbix_server_precmd() { pidfile=${zabbix_server_pidfile} if get_pidfile_from_conf PidFile ${zabbix_server_config}; then pidfile="$_pidfile_from_conf" fi logfile=/var/log/zabbix/zabbix_server.log if get_pidfile_from_conf LogFile ${zabbix_server_config}; then logfile="$_pidfile_from_conf" fi local rundir=${pidfile%/*} local logdir=${logfile%/*} [ -d $rundir ] || install -d -m 0755 -o zabbix -g zabbix $rundir [ -d $logdir ] || install -d -m 0755 -o zabbix -g zabbix $logdir # This shouldn't be necessary with pidfile, but empirically it was the # only way to reap the parent PID instead of all PIDs from # check_process, which may leak SysV IPC objects and prevent restart # and/or race condition on restart. rc_pid=$(check_pidfile ${pidfile} ${command}) } zabbix_server_cmd() { PATH=$zabbix_server_paths $command -c $zabbix_server_config } run_rc_command "$1"