Attachment #211909 for bug #244380

Lines 1-7 Link Here

(-)sysutils/consul/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= consul	3	PORTNAME= consul
4	PORTVERSION= 1.6.2	4	PORTVERSION= 1.7.1
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7		7

Lines 1-3 Link Here

(-)sysutils/consul/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1576365597	1	TIMESTAMP = 1582502092
2	SHA256 (hashicorp-consul-v1.6.2_GH0.tar.gz) = 98ba4f3e271536954deb118fe88bfcbd3c6150defeee8a2b946a4dff98594a75	2	SHA256 (hashicorp-consul-v1.7.1_GH0.tar.gz) = 127424a33f9ea94625c3daf77e5c818ae7ecf67f13e9d44a0b17735eaa2354ed
3	SIZE (hashicorp-consul-v1.6.2_GH0.tar.gz) = 22041280	3	SIZE (hashicorp-consul-v1.7.1_GH0.tar.gz) = 22751637




#
# Additional variables you can define are:
#
# consul_user (string):                Set user to run consul.
#                                      Default is "%%CONSUL_USER%%".
# consul_group (string):               Set group to run consul.
#                                      Default is "%%CONSUL_GROUP%%".
# consul_configtest (string):          Set to yes to enable Consul config validation
#                                      Set to NO by default
# consul_datadir (dir):                Set dir to run consul in.
#                                      Default is "%%CONSUL_DATADIR%%"
# consul_datadir (dir):       Set dir to run consul in.
#                             Default is "%%CONSUL_DATADIR%%"
# consul_syslog_output_enable (bool):  Set to YES to enable syslog output
#                                      Default is "NO". See daemon(8).
# consul_syslog_output_tag (str):      Set syslog tag if syslog enabled.
#                                      Default is "consul". See daemon(8).
# consul_syslog_output_priority (str): Set syslog priority if syslog enabled.
#                                      Default is "info". See daemon(8).
# consul_syslog_output_facility (str): Set to YES to enable syslog output

: ${consul_syslog_output_enable:="NO"}
: ${consul_user:="%%CONSUL_USER%%"}
: ${consul_group:="%%CONSUL_GROUP%%"}
: ${consul_pidfile:="/var/run/${name}.pid"}
: ${consul_configtest:="NO"}
: ${consul_datadir:="%%CONSUL_DATADIR%%"}



# backwards compatibility
if [ -n "${consul_dir}" ]; then
	consul_datadir=${consul_dir}
fi

if checkyesno consul_syslog_output_enable; then
	if [ -n "${consul_syslog_output_tag}" ]; then
		consul_syslog_output_flags="-T ${consul_syslog_output_tag}"
	else
		consul_syslog_output_flags="-T ${name}"
	fi
	if [ -n "${consul_syslog_output_priority}" ]; then
		consul_syslog_output_flags="${consul_syslog_output_flags} -s ${consul_syslog_output_priority}"
	fi
	if [ -n "${consul_syslog_output_facility}" ]; then
		consul_syslog_output_flags="${consul_syslog_output_flags} -l ${consul_syslog_output_facility}"
	fi
fi  

if checkyesno consul_configtest; then
	restart_precmd="consul_checkconfig"
	reload_precmd="consul_checkconfig"
fi

pidfile="/var/run/${name}/${name}.pid"
procname="%%PREFIX%%/bin/consul"
command="/usr/sbin/daemon"
consul_main="/usr/bin/env ${consul_env} %%PREFIX%%/bin/consul agent -data-dir=${consul_datadir} -config-dir=%%ETCDIR%% ${consul_args}"
command_args="-f ${consul_syslog_output_flags} -P ${pidfile} -t ${name} ${consul_main}"

consul_start_precmd()
{
	if [ ! -d "/var/run/${name}" ]; then
		install -d -m 0750 -o ${consul_user} -g ${consul_group} "/var/run/${name}"
        fi

        if [ ! -d ${consul_datadir} ]; then
                install -d -m 0750 -o ${consul_user} -g ${consul_group} ${consul_datadir}
        fi

        if [ ! -d %%ETCDIR%% ]; then
		install -d -m 0750 -o ${consul_user} -g ${consul_group} %%ETCDIR%%
	fi
	if [ ! -d "${consul_datadir}" ]; then
		install -d -m 0750 -o ${consul_user} -g ${consul_group} "${consul_datadir}"
	fi
	if [ ! -d "%%ETCDIR%%" ]; then
		install -d -m 0750 -o ${consul_user} -g ${consul_group} "%%ETCDIR%%"
	fi
}

consul_checkconfig()

Return to bug 244380

Lines 10-27 Link Here

(-)sysutils/consul/files/consul.in (-36 / +35 lines)
10	#	10	#
11	# Additional variables you can define are:	11	# Additional variables you can define are:
12	#	12	#
13	# consul_user (string): Set user to run consul.	13	# consul_user (string): Set user to run consul.
14	# Default is "%%CONSUL_USER%%".	14	# Default is "%%CONSUL_USER%%".
15	# consul_group (string): Set group to run consul.	15	# consul_group (string): Set group to run consul.
16	# Default is "%%CONSUL_GROUP%%".	16	# Default is "%%CONSUL_GROUP%%".
17	# consul_pidfile (string): Set full path to pid file	17	# consul_configtest (string): Set to yes to enable Consul config validation
18	# Default is "/var/run/consul.pid"	18	# Set to NO by default
19	# consul_configtest (string): Set to yes to enable Consul config validation	19	# consul_datadir (dir): Set dir to run consul in.
20	# Set to NO by default	20	# Default is "%%CONSUL_DATADIR%%"
21	# consul_datadir (dir): Set dir to run consul in.
22	# Default is "%%CONSUL_DATADIR%%"
23	# consul_syslog_output_enable (bool): Set to YES to enable syslog output	21	# consul_syslog_output_enable (bool): Set to YES to enable syslog output
24	# Default is "NO". See daemon(8).	22	# Default is "NO". See daemon(8).
		23	# consul_syslog_output_tag (str): Set syslog tag if syslog enabled.
		24	# Default is "consul". See daemon(8).
25	# consul_syslog_output_priority (str): Set syslog priority if syslog enabled.	25	# consul_syslog_output_priority (str): Set syslog priority if syslog enabled.
26	# Default is "info". See daemon(8).	26	# Default is "info". See daemon(8).
27	# consul_syslog_output_facility (str): Set to YES to enable syslog output	27	# consul_syslog_output_facility (str): Set to YES to enable syslog output
Lines 41-47 Link Here
41	: ${consul_syslog_output_enable:="NO"}	41	: ${consul_syslog_output_enable:="NO"}
42	: ${consul_user:="%%CONSUL_USER%%"}	42	: ${consul_user:="%%CONSUL_USER%%"}
43	: ${consul_group:="%%CONSUL_GROUP%%"}	43	: ${consul_group:="%%CONSUL_GROUP%%"}
44	: ${consul_pidfile:="/var/run/${name}.pid"}
45	: ${consul_configtest:="NO"}	44	: ${consul_configtest:="NO"}
46	: ${consul_datadir:="%%CONSUL_DATADIR%%"}	45	: ${consul_datadir:="%%CONSUL_DATADIR%%"}
47		46
Lines 51-94 Link Here
51		50
52	# backwards compatibility	51	# backwards compatibility
53	if [ -n "${consul_dir}" ]; then	52	if [ -n "${consul_dir}" ]; then
54	consul_datadir=${consul_dir}	53	consul_datadir=${consul_dir}
55	fi	54	fi
56		55
57	if checkyesno consul_syslog_output_enable; then	56	if checkyesno consul_syslog_output_enable; then
58	consul_syslog_output_flags="-T ${name}"	57	if [ -n "${consul_syslog_output_tag}" ]; then
59		58	consul_syslog_output_flags="-T ${consul_syslog_output_tag}"
60	if [ -n "${consul_syslog_output_priority}" ]; then	59	else
61	consul_syslog_output_flags="${consul_syslog_output_flags} -s ${consul_syslog_output_priority}"	60	consul_syslog_output_flags="-T ${name}"
62	fi	61	fi
63		62	if [ -n "${consul_syslog_output_priority}" ]; then
64	if [ -n "${consul_syslog_output_facility}" ]; then	63	consul_syslog_output_flags="${consul_syslog_output_flags} -s ${consul_syslog_output_priority}"
65	consul_syslog_output_flags="${consul_syslog_output_flags} -l ${consul_syslog_output_facility}"	64	fi
66	fi	65	if [ -n "${consul_syslog_output_facility}" ]; then
		66	consul_syslog_output_flags="${consul_syslog_output_flags} -l ${consul_syslog_output_facility}"
		67	fi
67	fi	68	fi
68		69
69	if checkyesno consul_configtest; then	70	if checkyesno consul_configtest; then
70	restart_precmd="consul_checkconfig"	71	restart_precmd="consul_checkconfig"
71	reload_precmd="consul_checkconfig"	72	reload_precmd="consul_checkconfig"
72	fi	73	fi
73		74
74	pidfile=${consul_pidfile}	75	pidfile="/var/run/${name}/${name}.pid"
75	procname="%%PREFIX%%/bin/consul"
76	command="/usr/sbin/daemon"	76	command="/usr/sbin/daemon"
77	command_args="-f -t ${name} ${consul_syslog_output_flags} -p ${pidfile} /usr/bin/env ${consul_env} ${procname} agent -data-dir=${consul_datadir} -config-dir=%%ETCDIR%% ${consul_args}"	77	consul_main="/usr/bin/env ${consul_env} %%PREFIX%%/bin/consul agent -data-dir=${consul_datadir} -config-dir=%%ETCDIR%% ${consul_args}"
		78	command_args="-f ${consul_syslog_output_flags} -P ${pidfile} -t ${name} ${consul_main}"
78		79
79	consul_start_precmd()	80	consul_start_precmd()
80	{	81	{
81	if [ ! -e ${pidfile} ]; then	82	if [ ! -d "/var/run/${name}" ]; then
82	install -o ${consul_user} -g ${consul_group} /dev/null ${pidfile}	83	install -d -m 0750 -o ${consul_user} -g ${consul_group} "/var/run/${name}"
83	fi
84
85	if [ ! -d ${consul_datadir} ]; then
86	install -d -m 0750 -o ${consul_user} -g ${consul_group} ${consul_datadir}
87	fi
88
89	if [ ! -d %%ETCDIR%% ]; then
90	install -d -m 0750 -o ${consul_user} -g ${consul_group} %%ETCDIR%%
91	fi	84	fi
		85	if [ ! -d "${consul_datadir}" ]; then
		86	install -d -m 0750 -o ${consul_user} -g ${consul_group} "${consul_datadir}"
		87	fi
		88	if [ ! -d "%%ETCDIR%%" ]; then
		89	install -d -m 0750 -o ${consul_user} -g ${consul_group} "%%ETCDIR%%"
		90	fi
92	}	91	}
93		92
94	consul_checkconfig()	93	consul_checkconfig()