Date: Wed, 10 Jun 2020 23:04:46 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538444 - in head/sysutils/consul: . files Message-ID: <202006102304.05AN4kMm043070@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Wed Jun 10 23:04:45 2020 New Revision: 538444 URL: https://svnweb.freebsd.org/changeset/ports/538444 Log: sysutils/consul: update to 1.7.4 While here, improve a variable name and remove config test since it doesn't seem to work properly Modified: head/sysutils/consul/Makefile (contents, props changed) head/sysutils/consul/distinfo (contents, props changed) head/sysutils/consul/files/consul.in Modified: head/sysutils/consul/Makefile ============================================================================== --- head/sysutils/consul/Makefile Wed Jun 10 22:46:27 2020 (r538443) +++ head/sysutils/consul/Makefile Wed Jun 10 23:04:45 2020 (r538444) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= consul -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.4 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -29,15 +29,14 @@ PLIST_FILES= bin/consul ETCDIR= ${PREFIX}/etc/${PORTNAME}.d CONSUL_USER?= consul CONSUL_GROUP?= consul -CONSUL_DATADIR?= /var/db/${PORTNAME} +CONSUL_DBDIR?= /var/db/${PORTNAME} USERS= ${CONSUL_USER} GROUPS= ${CONSUL_GROUP} -SUB_LIST= CONSUL_DATADIR=${CONSUL_DATADIR} \ - CONSUL_GROUP=${CONSUL_GROUP} \ - CONSUL_USER=${CONSUL_USER} \ - ETCDIR=${ETCDIR} +SUB_LIST= CONSUL_DBDIR=${CONSUL_DBDIR} \ + GROUP=${GROUP} \ + USER=${USER} post-extract: ${MKDIR} ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME} Modified: head/sysutils/consul/distinfo ============================================================================== --- head/sysutils/consul/distinfo Wed Jun 10 22:46:27 2020 (r538443) +++ head/sysutils/consul/distinfo Wed Jun 10 23:04:45 2020 (r538444) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588751972 -SHA256 (hashicorp-consul-v1.7.3_GH0.tar.gz) = db1cfede52f73038f9f4d87f4698837cf6f7ff3957994dbdce0db78795a081bd -SIZE (hashicorp-consul-v1.7.3_GH0.tar.gz) = 22785232 +TIMESTAMP = 1591829205 +SHA256 (hashicorp-consul-v1.7.4_GH0.tar.gz) = 2b48f0f2cd38201aed032981626c64aab9cb2920385847f68251af049063b475 +SIZE (hashicorp-consul-v1.7.4_GH0.tar.gz) = 22787889 Modified: head/sysutils/consul/files/consul.in ============================================================================== --- head/sysutils/consul/files/consul.in Wed Jun 10 22:46:27 2020 (r538443) +++ head/sysutils/consul/files/consul.in Wed Jun 10 23:04:45 2020 (r538444) @@ -11,15 +11,13 @@ # Additional variables you can define are: # # consul_user (string): Set user to run consul. -# Default is "%%CONSUL_USER%%". +# Default is "%%USER%%". # consul_group (string): Set group to run consul. -# Default is "%%CONSUL_GROUP%%". +# Default is "%%GROUP%%". # consul_pidfile (string): Set full path to pid file # Default is "/var/run/consul.pid" -# 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%%" +# Default is "%%DBDIR%%" # 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. @@ -41,15 +39,13 @@ load_rc_config $name : ${consul_enable:="NO"} : ${consul_syslog_output_enable:="NO"} -: ${consul_user:="%%CONSUL_USER%%"} -: ${consul_group:="%%CONSUL_GROUP%%"} +: ${consul_user:="%%USER%%"} +: ${consul_group:="%%GROUP%%"} : ${consul_pidfile:="/var/run/${name}.pid"} -: ${consul_configtest:="NO"} -: ${consul_datadir:="%%CONSUL_DATADIR%%"} +: ${consul_datadir:="%%CONSUL_DBDIR%%"} start_precmd="consul_start_precmd" -extra_commands="reload configtest" -configtest_cmd="consul_checkconfig" +extra_commands="reload" # backwards compatibility if [ -n "${consul_dir}" ]; then @@ -71,11 +67,6 @@ if checkyesno consul_syslog_output_enable; then fi fi -if checkyesno consul_configtest; then - restart_precmd="consul_checkconfig" - reload_precmd="consul_checkconfig" -fi - pidfile=${consul_pidfile} procname="%%PREFIX%%/bin/consul" command="/usr/sbin/daemon" @@ -94,12 +85,6 @@ consul_start_precmd() if [ ! -d %%ETCDIR%% ]; then install -d -m 0750 -o ${consul_user} -g ${consul_group} %%ETCDIR%% fi -} - -consul_checkconfig() -{ - echo "Performing sanity check on ${name} configuration:" - eval ${procname} validate "%%ETCDIR%%" } run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006102304.05AN4kMm043070>