FreeBSD Bugzilla – Attachment 211909 Details for
Bug 244380
[patch] sysutils/consul: Update to 1.7.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
consul.diff
consul.diff (text/plain), 5.67 KB, created by
Dmitry Wagin
on 2020-02-24 20:00:32 UTC
(
hide
)
Description:
consul.diff
Filename:
MIME Type:
Creator:
Dmitry Wagin
Created:
2020-02-24 20:00:32 UTC
Size:
5.67 KB
patch
obsolete
>Index: sysutils/consul/Makefile >=================================================================== >--- sysutils/consul/Makefile (revision 526928) >+++ sysutils/consul/Makefile (working copy) >@@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= consul >-PORTVERSION= 1.6.2 >+PORTVERSION= 1.7.1 > DISTVERSIONPREFIX= v > CATEGORIES= sysutils > >Index: sysutils/consul/distinfo >=================================================================== >--- sysutils/consul/distinfo (revision 526928) >+++ sysutils/consul/distinfo (working copy) >@@ -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 = 1582502092 >+SHA256 (hashicorp-consul-v1.7.1_GH0.tar.gz) = 127424a33f9ea94625c3daf77e5c818ae7ecf67f13e9d44a0b17735eaa2354ed >+SIZE (hashicorp-consul-v1.7.1_GH0.tar.gz) = 22751637 >Index: sysutils/consul/files/consul.in >=================================================================== >--- sysutils/consul/files/consul.in (revision 526928) >+++ sysutils/consul/files/consul.in (working copy) >@@ -10,18 +10,18 @@ > # > # 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_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 >@@ -41,7 +41,6 @@ > : ${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%%"} > >@@ -51,44 +50,44 @@ > > # backwards compatibility > if [ -n "${consul_dir}" ]; then >- consul_datadir=${consul_dir} >+ consul_datadir=${consul_dir} > fi > > if checkyesno consul_syslog_output_enable; then >- consul_syslog_output_flags="-T ${name}" >- >- 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 >+ 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" >+ restart_precmd="consul_checkconfig" >+ reload_precmd="consul_checkconfig" > fi > >-pidfile=${consul_pidfile} >-procname="%%PREFIX%%/bin/consul" >+pidfile="/var/run/${name}/${name}.pid" > command="/usr/sbin/daemon" >-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}" >+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 [ ! -e ${pidfile} ]; then >- install -o ${consul_user} -g ${consul_group} /dev/null ${pidfile} >- 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%% >+ 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 > } > > consul_checkconfig()
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=211909">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 244380
:
211909
|
212696