Attachment #229359 for bug #259711

Lines 1-5 Link Here

(-)b/textproc/consul-template/Makefile (-4 / +4 lines)
1	PORTNAME= consul-template	1	PORTNAME= consul-template
2	PORTVERSION= 0.27.1	2	PORTVERSION= 0.27.2
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	CATEGORIES= textproc	4	CATEGORIES= textproc
5		5
Lines 18-27 GH_TUPLE= hashicorp:${PORTNAME}:${DISTVERSIONPREFIX}${PORTVERSION}:DEFAULT/src/g Link Here
18	davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \	18	davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
19	fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \	19	fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \
20	go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \	20	go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
21	golang:crypto:7f63de1d35b0:golang_crypto/vendor/golang.org/x/crypto \	21	golang:crypto:32db794688a5:golang_crypto/vendor/golang.org/x/crypto \
22	golang:net:0a1ea396d57c:golang_net/vendor/golang.org/x/net \	22	golang:net:e18ecbb05110:golang_net/vendor/golang.org/x/net \
23	golang:snappy:v0.0.2:golang_snappy/vendor/github.com/golang/snappy \	23	golang:snappy:v0.0.2:golang_snappy/vendor/github.com/golang/snappy \
24	golang:sys:fdedc70b468f:golang_sys/vendor/golang.org/x/sys \	24	golang:sys:665e8c7367d1:golang_sys/vendor/golang.org/x/sys \
25	golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \	25	golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
26	golang:time:3af7569d3a1e:golang_time/vendor/golang.org/x/time \	26	golang:time:3af7569d3a1e:golang_time/vendor/golang.org/x/time \
27	hashicorp:consul:v0.4.1:hashicorp_consul_sdk/vendor/github.com/hashicorp/consul/sdk \	27	hashicorp:consul:v0.4.1:hashicorp_consul_sdk/vendor/github.com/hashicorp/consul/sdk \




TIMESTAMP = 1636372533
SHA256 (hashicorp-consul-template-v0.27.2_GH0.tar.gz) = d2130136d79df0452d01273df9568c28154a181d408fe5e4b39da78ce4e5a14f
SIZE (hashicorp-consul-template-v0.27.2_GH0.tar.gz) = 215052
SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
SHA256 (armon-go-metrics-v0.3.4_GH0.tar.gz) = 43a08b6e237c2b82299750bee2b926987ee4140dfe0e8df43b0222b3283010ab

SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941
SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
SHA256 (golang-crypto-32db794688a5_GH0.tar.gz) = c971927593630ecfa6531da54a579bf04186c354e365975cd86ea0e4c2c82fb7
SIZE (golang-crypto-32db794688a5_GH0.tar.gz) = 1732714
SHA256 (golang-net-e18ecbb05110_GH0.tar.gz) = c30374f6fd34c6b77d53224aa3ba7458e3773d7e6e4fa16d88fb05c7d05e0e89
SIZE (golang-net-e18ecbb05110_GH0.tar.gz) = 1253124
SHA256 (golang-snappy-v0.0.2_GH0.tar.gz) = 1807e65db2cf6b03eb7d16345ce31c82e66d178828b588aafcf7fa162483de8d
SIZE (golang-snappy-v0.0.2_GH0.tar.gz) = 65973
SHA256 (golang-sys-665e8c7367d1_GH0.tar.gz) = 19c3498496d91ac9c0c0226c9b832c23a0b042b9a707be811ef976e801d373f4
SIZE (golang-sys-665e8c7367d1_GH0.tar.gz) = 1200405
SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
SHA256 (golang-time-3af7569d3a1e_GH0.tar.gz) = 93c79ee7ad72641dc5ebd47e6ecffa66e878e367ddbbef48208ff82a0b6fc7e0





# PROVIDE: consul_template
# REQUIRE: NETWORKING SERVERS DAEMON
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
# to enable this service:
#
# consul_template_enable (bool):                 Set to NO by default.
#                                                Set it to YES to enable consul-template.
# consul_template_user (user):                   Set user to run consul-template.
#                                                Default is "root".
# consul_template_group (group):                 Set group to run consul-template.
#                                                Default is "wheel".
# consul_template_env (string):                  Set environment variables used with consul-template.
#                                                Default is "".
# consul_template_args (string):                 Set flags used with consul-template.
#                                                Default is "".
# consul_template_syslog_output_enable (string): Set to YES to enable syslog output
#                                                Default is "NO". See daemon(8).
# consul_template_syslog_output_tag (str):       Set syslog tag if syslog enabled.
#                                                Default is "consul". See daemon(8).
# consul_template_syslog_output_priority (str):  Set syslog priority if syslog enabled.
#                                                Default is "info". See daemon(8).
# consul_template_syslog_output_facility (str):  Set syslog facility if syslog enabled.
#                                                Default is "daemon". See daemon(8).

. /etc/rc.subr


: ${consul_template_enable:="NO"}
: ${consul_template_user:="root"}
: ${consul_template_group:="wheel"}
: ${consul_template_env:=""}
: ${consul_template_args:=""}
: ${consul_template_syslog_output_enable:="NO"}

start_precmd="consul_template_start_precmd"

if checkyesno consul_template_syslog_output_enable; then
	if [ -n "${consul_template_syslog_output_tag}" ]; then
		consul_template_syslog_output_flags="-T ${consul_template_syslog_output_tag}"
	else
		consul_template_syslog_output_flags="-T ${name}"
	fi
	if [ -n "${consul_template_syslog_output_priority}" ]; then
		consul_template_syslog_output_flags="${consul_template_syslog_output_flags} -s ${consul_template_syslog_output_priority}"
	fi

	fi
fi

pidfile="/var/run/consul-template.pid"
procname="%%PREFIX%%/bin/consul-template"
command="/usr/sbin/daemon"
command_args="-f -t ${name} ${consul_template_syslog_output_flags} -p ${pidfile} /usr/bin/env ${consul_template_env} ${procname} -config=%%PREFIX%%/etc/consul-template.d ${consul_template_args}"
sig_stop="INT"

consul_template_start_precmd()

consul_template_startprecmd()
{
	if [ ! -e ${pidfile} ]; then
		install -m 0600 -o ${consul_template_user} -g ${consul_template_group} /dev/null "${pidfile}"
	fi
}

run_rc_command "$1"

Return to bug 259711

Lines 1-6 Link Here

(-)b/textproc/consul-template/distinfo (-9 / +9 lines)
1	TIMESTAMP = 1633294992	1	TIMESTAMP = 1636372533
2	SHA256 (hashicorp-consul-template-v0.27.1_GH0.tar.gz) = 030c718e30ee31705469aa108269c8328c6e1bff6f104914093bc02d07d017e1	2	SHA256 (hashicorp-consul-template-v0.27.2_GH0.tar.gz) = d2130136d79df0452d01273df9568c28154a181d408fe5e4b39da78ce4e5a14f
3	SIZE (hashicorp-consul-template-v0.27.1_GH0.tar.gz) = 214559	3	SIZE (hashicorp-consul-template-v0.27.2_GH0.tar.gz) = 215052
4	SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f	4	SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
5	SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077	5	SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
6	SHA256 (armon-go-metrics-v0.3.4_GH0.tar.gz) = 43a08b6e237c2b82299750bee2b926987ee4140dfe0e8df43b0222b3283010ab	6	SHA256 (armon-go-metrics-v0.3.4_GH0.tar.gz) = 43a08b6e237c2b82299750bee2b926987ee4140dfe0e8df43b0222b3283010ab
Lines 11-24 SHA256 (fatih-color-v1.9.0_GH0.tar.gz) = f5a6372ff7c87d22baaa2089e5cdd8a218fb3a9 Link Here
11	SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941	11	SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941
12	SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07	12	SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
13	SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816	13	SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
14	SHA256 (golang-crypto-7f63de1d35b0_GH0.tar.gz) = 2d1bcc81ecd06b9d92ede3fc186c9d81cafa2aecba920d61981f2a0ec6153da3	14	SHA256 (golang-crypto-32db794688a5_GH0.tar.gz) = c971927593630ecfa6531da54a579bf04186c354e365975cd86ea0e4c2c82fb7
15	SIZE (golang-crypto-7f63de1d35b0_GH0.tar.gz) = 1732554	15	SIZE (golang-crypto-32db794688a5_GH0.tar.gz) = 1732714
16	SHA256 (golang-net-0a1ea396d57c_GH0.tar.gz) = cf4c4eace915abf78de6408f4825230840601c5956580c38e8398732eca6e487	16	SHA256 (golang-net-e18ecbb05110_GH0.tar.gz) = c30374f6fd34c6b77d53224aa3ba7458e3773d7e6e4fa16d88fb05c7d05e0e89
17	SIZE (golang-net-0a1ea396d57c_GH0.tar.gz) = 1178838	17	SIZE (golang-net-e18ecbb05110_GH0.tar.gz) = 1253124
18	SHA256 (golang-snappy-v0.0.2_GH0.tar.gz) = 1807e65db2cf6b03eb7d16345ce31c82e66d178828b588aafcf7fa162483de8d	18	SHA256 (golang-snappy-v0.0.2_GH0.tar.gz) = 1807e65db2cf6b03eb7d16345ce31c82e66d178828b588aafcf7fa162483de8d
19	SIZE (golang-snappy-v0.0.2_GH0.tar.gz) = 65973	19	SIZE (golang-snappy-v0.0.2_GH0.tar.gz) = 65973
20	SHA256 (golang-sys-fdedc70b468f_GH0.tar.gz) = dbb02cdcafaa32d9d2cd0c16b7204fbb044512bc38814cb1ee5673a9ab2f2929	20	SHA256 (golang-sys-665e8c7367d1_GH0.tar.gz) = 19c3498496d91ac9c0c0226c9b832c23a0b042b9a707be811ef976e801d373f4
21	SIZE (golang-sys-fdedc70b468f_GH0.tar.gz) = 1064136	21	SIZE (golang-sys-665e8c7367d1_GH0.tar.gz) = 1200405
22	SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185	22	SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
23	SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332	23	SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
24	SHA256 (golang-time-3af7569d3a1e_GH0.tar.gz) = 93c79ee7ad72641dc5ebd47e6ecffa66e878e367ddbbef48208ff82a0b6fc7e0	24	SHA256 (golang-time-3af7569d3a1e_GH0.tar.gz) = 93c79ee7ad72641dc5ebd47e6ecffa66e878e367ddbbef48208ff82a0b6fc7e0

Lines 2-28 Link Here

(-)b/textproc/consul-template/files/consul-template.in (-26 / +30 lines)
2		2
3	# PROVIDE: consul_template	3	# PROVIDE: consul_template
4	# REQUIRE: NETWORKING SERVERS DAEMON	4	# REQUIRE: NETWORKING SERVERS DAEMON
5	# KEYWORD: shtudown	5	# KEYWORD: shutdown
6	#	6	#
7	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf	7	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
8	# to enable this service:	8	# to enable this service:
9	#	9	#
10	# consul_template_enable (bool): Set to NO by default.	10	# consul_template_enable (bool): Set to NO by default.
11	# Set it to YES to enable consul-template.	11	# Set it to YES to enable consul-template.
12	# consul_template_user (user): Set user to run consul-template.	12	# consul_template_user (user): Set user to run consul-template.
13	# Default is "root".	13	# Default is "root".
14	# consul_template_group (group): Set group to run consul-template.	14	# consul_template_group (group): Set group to run consul-template.
15	# Default is "wheel".	15	# Default is "wheel".
16	# consul_template_env (string): Set environment variables used with consul-template.	16	# consul_template_env (string): Set environment variables used with consul-template.
17	# Default is "".	17	# Default is "".
18	# consul_template_args (string): Set flags used with consul-template.	18	# consul_template_args (string): Set flags used with consul-template.
19	# Default is "".	19	# Default is "".
20	# consul_template_syslog_output_enable (string): Set to YES to enable syslog output	20	# consul_template_syslog_output_enable (string): Set to YES to enable syslog output
21	# Default is "NO". See daemon(8).	21	# Default is "NO". See daemon(8).
22	# consul_template_syslog_output_priority (str): Set syslog priority if syslog enabled.	22	# consul_template_syslog_output_tag (str): Set syslog tag if syslog enabled.
23	# Default is "info". See daemon(8).	23	# Default is "consul". See daemon(8).
24	# consul_template_syslog_output_facility (str): Set syslog facility if syslog enabled.	24	# consul_template_syslog_output_priority (str): Set syslog priority if syslog enabled.
25	# Default is "daemon". See daemon(8).	25	# Default is "info". See daemon(8).
		26	# consul_template_syslog_output_facility (str): Set syslog facility if syslog enabled.
		27	# Default is "daemon". See daemon(8).
26		28
27	. /etc/rc.subr	29	. /etc/rc.subr
28		30
Lines 34-45 load_rc_config $name Link Here
34	: ${consul_template_enable:="NO"}	36	: ${consul_template_enable:="NO"}
35	: ${consul_template_user:="root"}	37	: ${consul_template_user:="root"}
36	: ${consul_template_group:="wheel"}	38	: ${consul_template_group:="wheel"}
37	: ${consul_template_env:=""}
38	: ${consul_template_args:=""}
39	: ${consul_template_syslog_output_enable:="NO"}	39	: ${consul_template_syslog_output_enable:="NO"}
40		40
		41	start_precmd="consul_template_start_precmd"
		42
41	if checkyesno consul_template_syslog_output_enable; then	43	if checkyesno consul_template_syslog_output_enable; then
42	consul_template_syslog_output_flags="-T ${name}"	44	if [ -n "${consul_template_syslog_output_tag}" ]; then
		45	consul_template_syslog_output_flags="-T ${consul_template_syslog_output_tag}"
		46	else
		47	consul_template_syslog_output_flags="-T ${name}"
		48	fi
43	if [ -n "${consul_template_syslog_output_priority}" ]; then	49	if [ -n "${consul_template_syslog_output_priority}" ]; then
44	consul_template_syslog_output_flags="${consul_template_syslog_output_flags} -s ${consul_template_syslog_output_priority}"	50	consul_template_syslog_output_flags="${consul_template_syslog_output_flags} -s ${consul_template_syslog_output_priority}"
45	fi	51	fi
Lines 49-67 if checkyesno consul_template_syslog_output_enable; then Link Here
49	fi	55	fi
50	fi	56	fi
51		57
52	pidfile=/var/run/consul-template.pid	58	pidfile="/var/run/consul-template.pid"
53	procname="%%PREFIX%%/bin/consul-template"	59	procname="%%PREFIX%%/bin/consul-template"
54	command="/usr/sbin/daemon"	60	command="/usr/sbin/daemon"
55	command_args="-f -t ${name} ${consul_template_syslog_output_flags} -p ${pidfile} /usr/bin/env ${consul_template_env} ${procname} -config=%%PREFIX%%/etc/consul-template.d ${consul_template_args}"	61	command_args="-f -t ${name} ${consul_template_syslog_output_flags} -p ${pidfile} /usr/bin/env ${consul_template_env} ${procname} -config=%%PREFIX%%/etc/consul-template.d ${consul_template_args}"
56	sig_stop="INT"	62	sig_stop="INT"
57		63
58	start_precmd=consul_template_startprecmd	64	consul_template_start_precmd()
59
60	consul_template_startprecmd()
61	{	65	{
62	if [ ! -e ${pidfile} ]; then	66	if [ ! -e ${pidfile} ]; then
63	install -o ${consul_template_user} -g ${consul_template_group} /dev/null ${pidfile}	67	install -m 0600 -o ${consul_template_user} -g ${consul_template_group} /dev/null "${pidfile}"
64	fi	68	fi
65	}	69	}
66		70
67	run_rc_command "$1"	71	run_rc_command "$1"