diff --git a/textproc/consul-template/Makefile b/textproc/consul-template/Makefile index f7f660b701cf..955bc85debb4 100644 --- a/textproc/consul-template/Makefile +++ b/textproc/consul-template/Makefile @@ -1,72 +1,72 @@ PORTNAME= consul-template -PORTVERSION= 0.27.1 +PORTVERSION= 0.27.2 DISTVERSIONPREFIX= v CATEGORIES= textproc MAINTAINER= swills@FreeBSD.org # co-maintainer: brd COMMENT= Generic template rendering and notifications with Consul LICENSE= MPL20 USES= go:modules USE_GITHUB= yes GH_TUPLE= hashicorp:${PORTNAME}:${DISTVERSIONPREFIX}${PORTVERSION}:DEFAULT/src/github.com/hashicorp/consul-template \ BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ armon:go-metrics:v0.3.4:armon_go_metrics/vendor/github.com/armon/go-metrics \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \ go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - golang:crypto:7f63de1d35b0:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:0a1ea396d57c:golang_net/vendor/golang.org/x/net \ + golang:crypto:32db794688a5:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:e18ecbb05110:golang_net/vendor/golang.org/x/net \ golang:snappy:v0.0.2:golang_snappy/vendor/github.com/golang/snappy \ - golang:sys:fdedc70b468f:golang_sys/vendor/golang.org/x/sys \ + golang:sys:665e8c7367d1:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \ golang:time:3af7569d3a1e:golang_time/vendor/golang.org/x/time \ hashicorp:consul:v0.4.1:hashicorp_consul_sdk/vendor/github.com/hashicorp/consul/sdk \ hashicorp:consul:api/v1.4.0:hashicorp_consul_api/vendor/github.com/hashicorp/consul \ hashicorp:errwrap:v1.1.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \ hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \ hashicorp:go-gatedio:v0.5.0:hashicorp_go_gatedio/vendor/github.com/hashicorp/go-gatedio \ hashicorp:go-hclog:v0.14.1:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \ hashicorp:go-immutable-radix:v1.3.0:hashicorp_go_immutable_radix/vendor/github.com/hashicorp/go-immutable-radix \ hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \ hashicorp:go-retryablehttp:v0.6.7:hashicorp_go_retryablehttp/vendor/github.com/hashicorp/go-retryablehttp \ hashicorp:go-rootcerts:v1.0.2:hashicorp_go_rootcerts/vendor/github.com/hashicorp/go-rootcerts \ hashicorp:go-sockaddr:v1.0.2:hashicorp_go_sockaddr/vendor/github.com/hashicorp/go-sockaddr \ hashicorp:go-syslog:v1.0.0:hashicorp_go_syslog/vendor/github.com/hashicorp/go-syslog \ hashicorp:go-uuid:v1.0.1:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \ hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \ hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \ hashicorp:logutils:v1.0.0:hashicorp_logutils/vendor/github.com/hashicorp/logutils \ hashicorp:serf:v0.9.4:hashicorp_serf/vendor/github.com/hashicorp/serf \ hashicorp:vault:0dc007d98cc8:hashicorp_vault_sdk/vendor/github.com/hashicorp/vault \ hashicorp:vault:746c0b111519:hashicorp_vault_api \ imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \ mattn:go-colorable:v0.1.7:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ mattn:go-shellwords:v1.0.10:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords \ mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ mitchellh:go-testing-interface:v1.0.0:mitchellh_go_testing_interface/vendor/github.com/mitchellh/go-testing-interface \ mitchellh:hashstructure:v1.0.0:mitchellh_hashstructure/vendor/github.com/mitchellh/hashstructure \ mitchellh:mapstructure:v1.3.3:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ pierrec:lz4:v2.5.2:pierrec_lz4/vendor/github.com/pierrec/lz4 \ pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ ryanuber:go-glob:v1.0.0:ryanuber_go_glob/vendor/github.com/ryanuber/go-glob \ square:go-jose:v2.5.1:square_go_jose/vendor/gopkg.in/square/go-jose.v2 \ stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify +USE_RC_SUBR= consul-template + GO_BUILDFLAGS= -ldflags='\ -s -w -X github.com/hashicorp/consul-template/version.Name=${PORTNAME} \ -X github.com/hashicorp/consul-template/version.GitCommit=release' PLIST_FILES= bin/consul-template -USE_RC_SUBR= consul-template - post-extract: @${RM} -r ${WRKSRC}/vendor/github.com/hashicorp/vault/api @${RLN} ${WRKSRC_hashicorp_vault_api}/api ${WRKSRC}/vendor/github.com/hashicorp/vault/api .include diff --git a/textproc/consul-template/distinfo b/textproc/consul-template/distinfo index 3a6c78800594..1c3d1370d230 100644 --- a/textproc/consul-template/distinfo +++ b/textproc/consul-template/distinfo @@ -1,91 +1,91 @@ -TIMESTAMP = 1633294992 -SHA256 (hashicorp-consul-template-v0.27.1_GH0.tar.gz) = 030c718e30ee31705469aa108269c8328c6e1bff6f104914093bc02d07d017e1 -SIZE (hashicorp-consul-template-v0.27.1_GH0.tar.gz) = 214559 +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 (armon-go-metrics-v0.3.4_GH0.tar.gz) = 32261 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 SHA256 (fatih-color-v1.9.0_GH0.tar.gz) = f5a6372ff7c87d22baaa2089e5cdd8a218fb3a9be047195c0ab421d5340f6f3f 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-7f63de1d35b0_GH0.tar.gz) = 2d1bcc81ecd06b9d92ede3fc186c9d81cafa2aecba920d61981f2a0ec6153da3 -SIZE (golang-crypto-7f63de1d35b0_GH0.tar.gz) = 1732554 -SHA256 (golang-net-0a1ea396d57c_GH0.tar.gz) = cf4c4eace915abf78de6408f4825230840601c5956580c38e8398732eca6e487 -SIZE (golang-net-0a1ea396d57c_GH0.tar.gz) = 1178838 +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-fdedc70b468f_GH0.tar.gz) = dbb02cdcafaa32d9d2cd0c16b7204fbb044512bc38814cb1ee5673a9ab2f2929 -SIZE (golang-sys-fdedc70b468f_GH0.tar.gz) = 1064136 +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 SIZE (golang-time-3af7569d3a1e_GH0.tar.gz) = 9619 SHA256 (hashicorp-consul-v0.4.1_GH0.tar.gz) = 16e681a7d88b1aa7422767c7bb77caa4ec530b313058d7b2bfd896132b8b63c2 SIZE (hashicorp-consul-v0.4.1_GH0.tar.gz) = 1517746 SHA256 (hashicorp-consul-api-v1.4.0_GH0.tar.gz) = c8ce7d3e19f95362d55083ce3f376a3ea9e6edae05b8f4b5c6ab30ca7613c704 SIZE (hashicorp-consul-api-v1.4.0_GH0.tar.gz) = 22792797 SHA256 (hashicorp-errwrap-v1.1.0_GH0.tar.gz) = 0d73891a7a179e50a142ac8832db97b17c792d29ae205b0e6aeedde4c43d51a4 SIZE (hashicorp-errwrap-v1.1.0_GH0.tar.gz) = 8581 SHA256 (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 24dedefe5edc4698dfa7e15a472369078a3447e8096e6d856549341c873c4a0b SIZE (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 8069 SHA256 (hashicorp-go-gatedio-v0.5.0_GH0.tar.gz) = e31af667617112541f3c79999defaea9eee316969ab867674dfd2fa6f3dc5b77 SIZE (hashicorp-go-gatedio-v0.5.0_GH0.tar.gz) = 8250 SHA256 (hashicorp-go-hclog-v0.14.1_GH0.tar.gz) = 4bf58078d853a3e798b0841bf989f76a757318f169590c3fef54d35858d92643 SIZE (hashicorp-go-hclog-v0.14.1_GH0.tar.gz) = 25390 SHA256 (hashicorp-go-immutable-radix-v1.3.0_GH0.tar.gz) = 6072cfc76f23e45aee0a2a0d0a168d2005fdb15817ab4a23e52df40eb12cda38 SIZE (hashicorp-go-immutable-radix-v1.3.0_GH0.tar.gz) = 25023 SHA256 (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 466a1f3596417a35b407d06d2dc2cb87dba46b025af4f77d30f82aa6e0e6d4d4 SIZE (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 12084 SHA256 (hashicorp-go-retryablehttp-v0.6.7_GH0.tar.gz) = 08c556231db306135764b75fcff0747eaf9436a5da07756032d95e8798653943 SIZE (hashicorp-go-retryablehttp-v0.6.7_GH0.tar.gz) = 20302 SHA256 (hashicorp-go-rootcerts-v1.0.2_GH0.tar.gz) = dca11d5ff16f3d29f632a7bf3c13cb9c87f021a5363faf22e4c45c8e073bf64c SIZE (hashicorp-go-rootcerts-v1.0.2_GH0.tar.gz) = 12242 SHA256 (hashicorp-go-sockaddr-v1.0.2_GH0.tar.gz) = ce70228b6c0ac432b97c2a98697600668bf7ac8b4cd21e7c6767bed1e755ae7f SIZE (hashicorp-go-sockaddr-v1.0.2_GH0.tar.gz) = 663049 SHA256 (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) = be4bda814c068311ea8e185e2d108077f167897cfa868ada7f56d97a10f3d602 SIZE (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) = 4517 SHA256 (hashicorp-go-uuid-v1.0.1_GH0.tar.gz) = 2e4e3f95caaf954f54a01b82094533ae3e2cdd754c81f7a977b86aa23cbf4135 SIZE (hashicorp-go-uuid-v1.0.1_GH0.tar.gz) = 6847 SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e9071694fa06428a9964b22d68dc997fa787a177a SIZE (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = 13428 SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2 SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658 SHA256 (hashicorp-logutils-v1.0.0_GH0.tar.gz) = 9e3c7cee3552acacd2ad1d212f87c682d227179e34b306afdce945b41799e4b6 SIZE (hashicorp-logutils-v1.0.0_GH0.tar.gz) = 7753 SHA256 (hashicorp-serf-v0.9.4_GH0.tar.gz) = b041fe46ebd1f5754b6ac8a42f8a5b4aa2d849c525285c251cc975c696734635 SIZE (hashicorp-serf-v0.9.4_GH0.tar.gz) = 2299336 SHA256 (hashicorp-vault-0dc007d98cc8_GH0.tar.gz) = 31da33941b4ea386591da1c0ef2ec7738583dfbfde615eb6d1e7d23033d0dcd9 SIZE (hashicorp-vault-0dc007d98cc8_GH0.tar.gz) = 27588167 SHA256 (hashicorp-vault-746c0b111519_GH0.tar.gz) = cc03f8337a6d36904f080a891e5e69a22168f1c904076864317d3d32ea99ba4b SIZE (hashicorp-vault-746c0b111519_GH0.tar.gz) = 27586132 SHA256 (imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302 SIZE (imdario-mergo-v0.3.12_GH0.tar.gz) = 22319 SHA256 (mattn-go-colorable-v0.1.7_GH0.tar.gz) = e394441b47cb26bb0c60ffdf2c60d57facbbc39f7a60763fdb1ec752cb460abf SIZE (mattn-go-colorable-v0.1.7_GH0.tar.gz) = 9560 SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548 SHA256 (mattn-go-shellwords-v1.0.10_GH0.tar.gz) = 418a2cfd56c2dae0b839efe0541d785586d805cbdba17d21cbe44604f53b3d88 SIZE (mattn-go-shellwords-v1.0.10_GH0.tar.gz) = 5151 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600 SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362 SHA256 (mitchellh-go-testing-interface-v1.0.0_GH0.tar.gz) = 6f32e180f1244fe5c512e6c1361fab865202cc1330e0ec9a6d6687d004f98c68 SIZE (mitchellh-go-testing-interface-v1.0.0_GH0.tar.gz) = 2808 SHA256 (mitchellh-hashstructure-v1.0.0_GH0.tar.gz) = 48cad81434c28dc8c04518e8d80ccc387dfaac25e0412021ba048cc9a4683424 SIZE (mitchellh-hashstructure-v1.0.0_GH0.tar.gz) = 6507 SHA256 (mitchellh-mapstructure-v1.3.3_GH0.tar.gz) = 660c2e8fd3c855022b2b566756eabe904167ce5ceb29ea3ce90ad0eb76ddd802 SIZE (mitchellh-mapstructure-v1.3.3_GH0.tar.gz) = 26054 SHA256 (pierrec-lz4-v2.5.2_GH0.tar.gz) = bf5ad1ce74f264bad828cea8a546e5d2100a7ab67695bf7badcbe14c57ec4df4 SIZE (pierrec-lz4-v2.5.2_GH0.tar.gz) = 20509582 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 SHA256 (ryanuber-go-glob-v1.0.0_GH0.tar.gz) = 4e2b03027a6de87825fcf450a728c86b83d9c30b062310323c6009e298da6711 SIZE (ryanuber-go-glob-v1.0.0_GH0.tar.gz) = 2969 SHA256 (square-go-jose-v2.5.1_GH0.tar.gz) = 74c65592183c542b254eb2933f7a99ee869abdf9e7ac02aad4d9f0dce980ace8 SIZE (square-go-jose-v2.5.1_GH0.tar.gz) = 309860 SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698 SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085 diff --git a/textproc/consul-template/files/consul-template.in b/textproc/consul-template/files/consul-template.in index e4d0d0b62982..e02a6267081e 100644 --- a/textproc/consul-template/files/consul-template.in +++ b/textproc/consul-template/files/consul-template.in @@ -1,67 +1,71 @@ #!/bin/sh # PROVIDE: consul_template # REQUIRE: NETWORKING SERVERS DAEMON -# KEYWORD: shtudown +# 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_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). +# 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-template". 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 name=consul_template rcvar=consul_template_enable load_rc_config $name : ${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 - consul_template_syslog_output_flags="-T ${name}" + 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 if [ -n "${consul_template_syslog_output_facility}" ]; then consul_template_syslog_output_flags="${consul_template_syslog_output_flags} -l ${consul_template_syslog_output_facility}" fi fi -pidfile=/var/run/consul-template.pid +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" -start_precmd=consul_template_startprecmd - -consul_template_startprecmd() +consul_template_start_precmd() { - if [ ! -e ${pidfile} ]; then - install -o ${consul_template_user} -g ${consul_template_group} /dev/null ${pidfile} - fi + if [ ! -e ${pidfile} ]; then + install -m 0600 -o ${consul_template_user} -g ${consul_template_group} /dev/null "${pidfile}" + fi } run_rc_command "$1"