Attachment #167991 for bug #207896

View | Details | Raw Unified | Return to bug 207896
Collapse All | Expand All

Lines 9-14 Link Here

(-)b/net-mgmt/zabbix2-server/files/zabbix_agentd.in (-3 / +29 lines)
9	#	9	#
10	# zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to	10	# zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to
11	# enable zabbix_agentd.	11	# enable zabbix_agentd.
		12	# zabbix_agentd_paths (string): Set to standard path by default. Set a search
		13	# if you have custom userparams that need binaries elsewhere.
		14	# zabbix_agentd_config (string): Set to the standard config file path by
		15	# default.
12	#	16	#
13		17
14	. /etc/rc.subr	18	. /etc/rc.subr
Lines 16-26 Link Here
16	name="zabbix_agentd"	20	name="zabbix_agentd"
17	rcvar=zabbix_agentd_enable	21	rcvar=zabbix_agentd_enable
18		22
19	command="%%PREFIX%%/sbin/${name}"
20	required_files="%%ETCDIR%%/${name}.conf"
21
22	load_rc_config $name	23	load_rc_config $name
23		24
24	: ${zabbix_agentd_enable="NO"}	25	: ${zabbix_agentd_enable="NO"}
		26	: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
		27	: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"}
		28
		29	command="%%PREFIX%%/sbin/${name}"
		30	required_files="${zabbix_agentd_config}"
		31	start_precmd="find_pidfile"
		32	status_precmd="find_pidfile"
		33	stop_precmd="find_pidfile"
		34
		35	find_pidfile()
		36	{
		37	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
		38	pidfile="$_pidfile_from_conf"
		39	else
		40	pidfile="/tmp/${name}.pid"
		41	fi
		42
		43	# This shouldn't be necessary with pidfile, but empirically it was the
		44	# only way to reap the parent PID instead of all PIDs from
		45	# check_process, which may leak SysV IPC objects and prevent restart
		46	# and/or race condition on restart.
		47	rc_pid=$(check_pidfile ${pidfile} ${command})
		48	}
		49
		50	export PATH="${zabbix_agentd_paths}"
25		51
26	run_rc_command "$1"	52	run_rc_command "$1"

Lines 9-14 Link Here

(-)b/net-mgmt/zabbix2-server/files/zabbix_proxy.in (-3 / +30 lines)
9	#	9	#
10	# zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to	10	# zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to
11	# enable zabbix_proxy.	11	# enable zabbix_proxy.
		12	# zabbix_proxy_paths (string): Set to standard path by default. Set a search
		13	# if you have custom externals that need binaries elsewhere.
		14	# zabbix_proxy_config (string): Set to the standard config file path by
		15	# default.
12	#	16	#
13		17
14	. /etc/rc.subr	18	. /etc/rc.subr
Lines 16-26 Link Here
16	name="zabbix_proxy"	20	name="zabbix_proxy"
17	rcvar=zabbix_proxy_enable	21	rcvar=zabbix_proxy_enable
18		22
19	command="%%PREFIX%%/sbin/${name}"
20	required_files="%%ETCDIR%%/${name}.conf"
21
22	load_rc_config $name	23	load_rc_config $name
23		24
24	: ${zabbix_proxy_enable="NO"}	25	: ${zabbix_proxy_enable="NO"}
		26	: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
		27	: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"}
		28
		29	command="%%PREFIX%%/sbin/${name}"
		30	required_files="${zabbix_proxy_config}"
		31	start_precmd="find_pidfile"
		32	status_precmd="find_pidfile"
		33	stop_precmd="find_pidfile"
		34
		35
		36	find_pidfile()
		37	{
		38	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
		39	pidfile="$_pidfile_from_conf"
		40	else
		41	pidfile="/tmp/${name}.pid"
		42	fi
		43
		44	# This shouldn't be necessary with pidfile, but empirically it was the
		45	# only way to reap the parent PID instead of all PIDs from
		46	# check_process, which may leak SysV IPC objects and prevent restart
		47	# and/or race condition on restart.
		48	rc_pid=$(check_pidfile ${pidfile} ${command})
		49	}
		50
		51	export PATH="${zabbix_proxy_paths}"
25		52
26	run_rc_command "$1"	53	run_rc_command "$1"

Lines 9-14 Link Here

(-)b/net-mgmt/zabbix2-server/files/zabbix_server.in (-3 / +29 lines)
9	#	9	#
10	# zabbix_server_enable (bool): Set to NO by default. Set it to YES to	10	# zabbix_server_enable (bool): Set to NO by default. Set it to YES to
11	# enable zabbix_server.	11	# enable zabbix_server.
		12	# zabbix_server_paths (string): Set to standard path by default. Set a search
		13	# if you have custom externals that need binaries elsewhere.
		14	# zabbix_server_config (string): Set to the standard config file path by
		15	# default.
12	#	16	#
13		17
14	. /etc/rc.subr	18	. /etc/rc.subr
Lines 16-26 Link Here
16	name="zabbix_server"	20	name="zabbix_server"
17	rcvar=zabbix_server_enable	21	rcvar=zabbix_server_enable
18		22
19	command="%%PREFIX%%/sbin/${name}"
20	required_files="%%ETCDIR%%/${name}.conf"
21
22	load_rc_config $name	23	load_rc_config $name
23		24
24	: ${zabbix_server_enable="NO"}	25	: ${zabbix_server_enable="NO"}
		26	: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
		27	: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"}
		28
		29	command="%%PREFIX%%/sbin/${name}"
		30	required_files="${zabbix_server_config}"
		31	start_precmd="find_pidfile"
		32	status_precmd="find_pidfile"
		33	stop_precmd="find_pidfile"
		34
		35	find_pidfile()
		36	{
		37	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
		38	pidfile="$_pidfile_from_conf"
		39	else
		40	pidfile="/tmp/${name}.pid"
		41	fi
		42
		43	# This shouldn't be necessary with pidfile, but empirically it was the
		44	# only way to reap the parent PID instead of all PIDs from
		45	# check_process, which may leak SysV IPC objects and prevent restart
		46	# and/or race condition on restart.
		47	rc_pid=$(check_pidfile ${pidfile} ${command})
		48	}
		49
		50	export PATH="${zabbix_server_paths}"
25		51
26	run_rc_command "$1"	52	run_rc_command "$1"

Lines 9-14 Link Here

(-)b/net-mgmt/zabbix22-server/files/zabbix_agentd.in (-3 / +29 lines)
9	#	9	#
10	# zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to	10	# zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to
11	# enable zabbix_agentd.	11	# enable zabbix_agentd.
		12	# zabbix_agentd_paths (string): Set to standard path by default. Set a search
		13	# if you have custom userparams that need binaries elsewhere.
		14	# zabbix_agentd_config (string): Set to the standard config file path by
		15	# default.
12	#	16	#
13		17
14	. /etc/rc.subr	18	. /etc/rc.subr
Lines 16-26 Link Here
16	name="zabbix_agentd"	20	name="zabbix_agentd"
17	rcvar=zabbix_agentd_enable	21	rcvar=zabbix_agentd_enable
18		22
19	command="%%PREFIX%%/sbin/${name}"
20	required_files="%%ETCDIR%%/${name}.conf"
21
22	load_rc_config $name	23	load_rc_config $name
23		24
24	: ${zabbix_agentd_enable="NO"}	25	: ${zabbix_agentd_enable="NO"}
		26	: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
		27	: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"}
		28
		29	command="%%PREFIX%%/sbin/${name}"
		30	required_files="${zabbix_agentd_config}"
		31	start_precmd="find_pidfile"
		32	status_precmd="find_pidfile"
		33	stop_precmd="find_pidfile"
		34
		35	find_pidfile()
		36	{
		37	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
		38	pidfile="$_pidfile_from_conf"
		39	else
		40	pidfile="/tmp/${name}.pid"
		41	fi
		42
		43	# This shouldn't be necessary with pidfile, but empirically it was the
		44	# only way to reap the parent PID instead of all PIDs from
		45	# check_process, which may leak SysV IPC objects and prevent restart
		46	# and/or race condition on restart.
		47	rc_pid=$(check_pidfile ${pidfile} ${command})
		48	}
		49
		50	export PATH="${zabbix_agentd_paths}"
25		51
26	run_rc_command "$1"	52	run_rc_command "$1"

Lines 11-16 Link Here

(-)b/net-mgmt/zabbix22-server/files/zabbix_proxy.in (-3 / +29 lines)
11	#	11	#
12	# zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to	12	# zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to
13	# enable zabbix_proxy.	13	# enable zabbix_proxy.
		14	# zabbix_proxy_paths (string): Set to standard path by default. Set a search
		15	# if you have custom externals that need binaries elsewhere.
		16	# zabbix_proxy_config (string): Set to the standard config file path by
		17	# default.
14	#	18	#
15		19
16	. /etc/rc.subr	20	. /etc/rc.subr
Lines 18-28 Link Here
18	name="zabbix_proxy"	22	name="zabbix_proxy"
19	rcvar=zabbix_proxy_enable	23	rcvar=zabbix_proxy_enable
20		24
21	command="%%PREFIX%%/sbin/${name}"
22	required_files="%%ETCDIR%%/${name}.conf"
23
24	load_rc_config $name	25	load_rc_config $name
25		26
26	: ${zabbix_proxy_enable="NO"}	27	: ${zabbix_proxy_enable="NO"}
		28	: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
		29	: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"}
		30
		31	command="%%PREFIX%%/sbin/${name}"
		32	required_files="${zabbix_proxy_config}"
		33	start_precmd="find_pidfile"
		34	status_precmd="find_pidfile"
		35	stop_precmd="find_pidfile"
		36
		37	find_pidfile()
		38	{
		39	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
		40	pidfile="$_pidfile_from_conf"
		41	else
		42	pidfile="/tmp/${name}.pid"
		43	fi
		44
		45	# This shouldn't be necessary with pidfile, but empirically it was the
		46	# only way to reap the parent PID instead of all PIDs from
		47	# check_process, which may leak SysV IPC objects and prevent restart
		48	# and/or race condition on restart.
		49	rc_pid=$(check_pidfile ${pidfile} ${command})
		50	}
		51
		52	export PATH="${zabbix_proxy_paths}"
27		53
28	run_rc_command "$1"	54	run_rc_command "$1"

Lines 11-16 Link Here

(-)b/net-mgmt/zabbix22-server/files/zabbix_server.in (-3 / +29 lines)
11	#	11	#
12	# zabbix_server_enable (bool): Set to NO by default. Set it to YES to	12	# zabbix_server_enable (bool): Set to NO by default. Set it to YES to
13	# enable zabbix_server.	13	# enable zabbix_server.
		14	# zabbix_server_paths (string): Set to standard path by default. Set a search
		15	# if you have custom externals that need binaries elsewhere.
		16	# zabbix_server_config (string): Set to the standard config file path by
		17	# default.
14	#	18	#
15		19
16	. /etc/rc.subr	20	. /etc/rc.subr
Lines 18-28 Link Here
18	name="zabbix_server"	22	name="zabbix_server"
19	rcvar=zabbix_server_enable	23	rcvar=zabbix_server_enable
20		24
21	command="%%PREFIX%%/sbin/${name}"
22	required_files="%%ETCDIR%%/${name}.conf"
23
24	load_rc_config $name	25	load_rc_config $name
25		26
26	: ${zabbix_server_enable="NO"}	27	: ${zabbix_server_enable="NO"}
		28	: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
		29	: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"}
		30
		31	command="%%PREFIX%%/sbin/${name}"
		32	required_files="${zabbix_server_config}"
		33	start_precmd="find_pidfile"
		34	status_precmd="find_pidfile"
		35	stop_precmd="find_pidfile"
		36
		37	find_pidfile()
		38	{
		39	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
		40	pidfile="$_pidfile_from_conf"
		41	else
		42	pidfile="/tmp/${name}.pid"
		43	fi
		44
		45	# This shouldn't be necessary with pidfile, but empirically it was the
		46	# only way to reap the parent PID instead of all PIDs from
		47	# check_process, which may leak SysV IPC objects and prevent restart
		48	# and/or race condition on restart.
		49	rc_pid=$(check_pidfile ${pidfile} ${command})
		50	}
		51
		52	export PATH="${zabbix_server_paths}"
27		53
28	run_rc_command "$1"	54	run_rc_command "$1"

Lines 9-14 Link Here

(-)b/net-mgmt/zabbix24-server/files/zabbix_agentd.in (-3 / +29 lines)
9	#	9	#
10	# zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to	10	# zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to
11	# enable zabbix_agentd.	11	# enable zabbix_agentd.
		12	# zabbix_agentd_paths (string): Set to standard path by default. Set a search
		13	# if you have custom userparams that need binaries elsewhere.
		14	# zabbix_agentd_config (string): Set to the standard config file path by
		15	# default.
12	#	16	#
13		17
14	. /etc/rc.subr	18	. /etc/rc.subr
Lines 16-26 Link Here
16	name="zabbix_agentd"	20	name="zabbix_agentd"
17	rcvar=zabbix_agentd_enable	21	rcvar=zabbix_agentd_enable
18		22
19	command="%%PREFIX%%/sbin/${name}"
20	required_files="%%ETCDIR%%/${name}.conf"
21
22	load_rc_config $name	23	load_rc_config $name
23		24
24	: ${zabbix_agentd_enable="NO"}	25	: ${zabbix_agentd_enable="NO"}
		26	: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
		27	: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"}
		28
		29	command="%%PREFIX%%/sbin/${name}"
		30	required_files="${zabbix_agentd_config}"
		31	start_precmd="find_pidfile"
		32	status_precmd="find_pidfile"
		33	stop_precmd="find_pidfile"
		34
		35	find_pidfile()
		36	{
		37	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
		38	pidfile="$_pidfile_from_conf"
		39	else
		40	pidfile="/tmp/${name}.pid"
		41	fi
		42
		43	# This shouldn't be necessary with pidfile, but empirically it was the
		44	# only way to reap the parent PID instead of all PIDs from
		45	# check_process, which may leak SysV IPC objects and prevent restart
		46	# and/or race condition on restart.
		47	rc_pid=$(check_pidfile ${pidfile} ${command})
		48	}
		49
		50	export PATH="${zabbix_agentd_paths}"
25		51
26	run_rc_command "$1"	52	run_rc_command "$1"

Lines 11-16 Link Here

(-)b/net-mgmt/zabbix24-server/files/zabbix_proxy.in (-3 / +29 lines)
11	#	11	#
12	# zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to	12	# zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to
13	# enable zabbix_proxy.	13	# enable zabbix_proxy.
		14	# zabbix_proxy_paths (string): Set to standard path by default. Set a search
		15	# if you have custom externals that need binaries elsewhere.
		16	# zabbix_proxy_config (string): Set to the standard config file path by
		17	# default.
14	#	18	#
15		19
16	. /etc/rc.subr	20	. /etc/rc.subr
Lines 18-28 Link Here
18	name="zabbix_proxy"	22	name="zabbix_proxy"
19	rcvar=zabbix_proxy_enable	23	rcvar=zabbix_proxy_enable
20		24
21	command="%%PREFIX%%/sbin/${name}"
22	required_files="%%ETCDIR%%/${name}.conf"
23
24	load_rc_config $name	25	load_rc_config $name
25		26
26	: ${zabbix_proxy_enable="NO"}	27	: ${zabbix_proxy_enable="NO"}
		28	: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
		29	: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"}
		30
		31	command="%%PREFIX%%/sbin/${name}"
		32	required_files="${zabbix_proxy_config}"
		33	start_precmd="find_pidfile"
		34	status_precmd="find_pidfile"
		35	stop_precmd="find_pidfile"
		36
		37	find_pidfile()
		38	{
		39	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
		40	pidfile="$_pidfile_from_conf"
		41	else
		42	pidfile="/tmp/${name}.pid"
		43	fi
		44
		45	# This shouldn't be necessary with pidfile, but empirically it was the
		46	# only way to reap the parent PID instead of all PIDs from
		47	# check_process, which may leak SysV IPC objects and prevent restart
		48	# and/or race condition on restart.
		49	rc_pid=$(check_pidfile ${pidfile} ${command})
		50	}
		51
		52	export PATH="${zabbix_proxy_paths}"
27		53
28	run_rc_command "$1"	54	run_rc_command "$1"

Lines 11-16 Link Here

(-)b/net-mgmt/zabbix24-server/files/zabbix_server.in (-3 / +29 lines)
11	#	11	#
12	# zabbix_server_enable (bool): Set to NO by default. Set it to YES to	12	# zabbix_server_enable (bool): Set to NO by default. Set it to YES to
13	# enable zabbix_server.	13	# enable zabbix_server.
		14	# zabbix_server_paths (string): Set to standard path by default. Set a search
		15	# if you have custom externals that need binaries elsewhere.
		16	# zabbix_server_config (string): Set to the standard config file path by
		17	# default.
14	#	18	#
15		19
16	. /etc/rc.subr	20	. /etc/rc.subr
Lines 18-28 Link Here
18	name="zabbix_server"	22	name="zabbix_server"
19	rcvar=zabbix_server_enable	23	rcvar=zabbix_server_enable
20		24
21	command="%%PREFIX%%/sbin/${name}"
22	required_files="%%ETCDIR%%/${name}.conf"
23
24	load_rc_config $name	25	load_rc_config $name
25		26
26	: ${zabbix_server_enable="NO"}	27	: ${zabbix_server_enable="NO"}
		28	: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin}
		29	: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"}
		30
		31	command="%%PREFIX%%/sbin/${name}"
		32	required_files="${zabbix_server_config}"
		33	start_precmd="find_pidfile"
		34	status_precmd="find_pidfile"
		35	stop_precmd="find_pidfile"
		36
		37	find_pidfile()
		38	{
		39	if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then
		40	pidfile="$_pidfile_from_conf"
		41	else
		42	pidfile="/tmp/${name}.pid"
		43	fi
		44
		45	# This shouldn't be necessary with pidfile, but empirically it was the
		46	# only way to reap the parent PID instead of all PIDs from
		47	# check_process, which may leak SysV IPC objects and prevent restart
		48	# and/or race condition on restart.
		49	rc_pid=$(check_pidfile ${pidfile} ${command})
		50	}
		51
		52	export PATH="${zabbix_server_paths}"
27		53
28	run_rc_command "$1"	54	run_rc_command "$1"

Return to bug 207896