From owner-svn-ports-all@freebsd.org Fri Mar 27 15:18:16 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 781D1278494; Fri, 27 Mar 2020 15:18:16 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48plqC0s7fz4FNL; Fri, 27 Mar 2020 15:18:15 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 72A11232BF; Fri, 27 Mar 2020 15:18:07 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RFI7T0095151; Fri, 27 Mar 2020 15:18:07 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RFI6KI095149; Fri, 27 Mar 2020 15:18:06 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202003271518.02RFI6KI095149@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 27 Mar 2020 15:18:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529259 - in head/sysutils/consul: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/sysutils/consul: . files X-SVN-Commit-Revision: 529259 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 15:18:16 -0000 Author: swills Date: Fri Mar 27 15:18:06 2020 New Revision: 529259 URL: https://svnweb.freebsd.org/changeset/ports/529259 Log: sysutils/consul: update to 1.7.2 [1][2] While here, improve rc script [1] PR: 244380 [1] PR: 244365 [2] Submitted by: Dmitry Wagin [1] Reported by: crest@rlwinm.de [2] 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 Fri Mar 27 15:05:54 2020 (r529258) +++ head/sysutils/consul/Makefile Fri Mar 27 15:18:06 2020 (r529259) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= consul -PORTVERSION= 1.6.2 +PORTVERSION= 1.7.2 DISTVERSIONPREFIX= v CATEGORIES= sysutils Modified: head/sysutils/consul/distinfo ============================================================================== --- head/sysutils/consul/distinfo Fri Mar 27 15:05:54 2020 (r529258) +++ head/sysutils/consul/distinfo Fri Mar 27 15:18:06 2020 (r529259) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576365597 -SHA256 (hashicorp-consul-v1.6.2_GH0.tar.gz) = 98ba4f3e271536954deb118fe88bfcbd3c6150defeee8a2b946a4dff98594a75 -SIZE (hashicorp-consul-v1.6.2_GH0.tar.gz) = 22041280 +TIMESTAMP = 1585133041 +SHA256 (hashicorp-consul-v1.7.2_GH0.tar.gz) = 5fbf25b8df906dfb4133eedf266a5c4a5af3022428b03a41928e1e48bd59a3b9 +SIZE (hashicorp-consul-v1.7.2_GH0.tar.gz) = 22755052 Modified: head/sysutils/consul/files/consul.in ============================================================================== --- head/sysutils/consul/files/consul.in Fri Mar 27 15:05:54 2020 (r529258) +++ head/sysutils/consul/files/consul.in Fri Mar 27 15:18:06 2020 (r529259) @@ -10,18 +10,20 @@ # # 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_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%%" +# 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_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%%" # 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 @@ -55,8 +57,11 @@ if [ -n "${consul_dir}" ]; then fi if checkyesno consul_syslog_output_enable; then - consul_syslog_output_flags="-T ${name}" - + 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 @@ -87,14 +92,14 @@ consul_start_precmd() fi if [ ! -d %%ETCDIR%% ]; then - install -d -m 0750 -o ${consul_user} -g ${consul_group} %%ETCDIR%% - fi + 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%%" + echo "Performing sanity check on ${name} configuration:" + eval ${procname} validate "%%ETCDIR%%" } run_rc_command "$1"